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 !331 opened Apr 10, 2016 by Tuukka Kivilahti@tkfftk

Place timeout removed

Asettuu edellisen mergereguestin päälle.

Edited Sep 21, 2016
Request to merge tkfftk:placeTimeoutRemoved 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 placeTimeoutRemoved
git checkout -b tkfftk/moya-placeTimeoutRemoved 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-placeTimeoutRemoved

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 0
  • Commits 2
  • Changes 18
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 029a7f0a - added comments
    Apr 10, 2016

    Added 1 commit:

    • 029a7f0a - added comments
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 5 commits:

    • df222c46 - 1 commit from branch codecrew:master
    • cacaa3d5 - tables
    • 756189c1 - Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya
    • 8006d397 - no longer place timeout
    • 1eb0381f - added comments
    Sep 21, 2016

    Added 5 commits:

    • df222c46 - 1 commit from branch codecrew:master
    • cacaa3d5 - tables
    • 756189c1 - Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya
    • 8006d397 - no longer place timeout
    • 1eb0381f - added comments
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 29 commits:

    • 1eb0381f...55325248 - 27 commits from branch codecrew:master
    • cea82251 - no longer place timeout
    • e0c36c3e - added comments
    Sep 21, 2016

    Added 29 commits:

    • 1eb0381f...55325248 - 27 commits from branch codecrew:master
    • cea82251 - no longer place timeout
    • e0c36c3e - added comments
    Toggle commit list
  • Tuomas Riihimäki @tuomari

    Status changed to merged

    Sep 21, 2016

    Status changed to merged

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    mentioned in commit 65bf3fdf

    Sep 21, 2016

    mentioned in commit 65bf3fdf

    Toggle commit list
  • 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
2
2 participants
Reference: codecrew/moya!331
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.