Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !94 opened Jun 18, 2014 by Tuukka Kivilahti@tkfftk

Pieniä korjailuja ja muutoksia

Edited Jun 18, 2014
Request to merge tkfftk:master into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.codecrew.fi/tkfftk/moya.git master
git checkout -b tkfftk/moya-master FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff tkfftk/moya-master

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

  • The changes were merged into master.
  • Discussion 1
  • Commits 2
  • Changes 8
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on the diff Jun 18, 2014
    code/MoyaWeb/WebContent/resources/cditools/user/eventuserlist.xhtml
    10 10  
    11 11  
    12 12  
    13 <p:dataTable styleClass="bordertable" id="usertable" value="#{userSearchView.eventuserModel}" rows="1000" paginator="true" lazy="true" var="user">
    13 <p:dataTable styleClass="bordertable" id="usertable" value="#{userSearchView.eventuserModel}" rows="100" paginator="true" lazy="true" var="user">
    • Tuukka Kivilahti @tkfftk commented Jun 18, 2014
      Owner

      Liika on liikaa, tähän vois joskus tehä hienon dropdownin. Ei nyt :).

  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: codecrew/moya!94