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 !427 opened Oct 26, 2018 by Tuomas Riihimäki@tuomari

Add information to place editor about reserved, but not locked place

Edited Jan 31, 2019
Request to merge reserved-not-locked into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b reserved-not-locked origin/reserved-not-locked

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 reserved-not-locked

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.

CI job passed for 71631cc7.
CI job skipped for 71631cc7.
CI job canceled for 71631cc7.
CI job failed for 71631cc7.
CI job running for 71631cc7.
CI job pending for 71631cc7.
Checking CI status for 71631cc7…
Could not find CI status for 71631cc7.
Could not connect to the CI server. Please check your settings and try again.

Merged

  • The changes were merged into master.
  • Discussion 5
  • Commits 1
  • Pipelines 2
  • Changes 5
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Oct 26, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Oct 26, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/354/

  • Jenkins @jenkins commented Oct 26, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/354/

  • Tuomas Riihimäki @tuomari

    added 9 commits

    • 9e57450f...327aa8cc - 8 commits from branch master
    • 97167624 - Add information to place editor about reservedd, but not locked place

    Compare with previous version

    Jan 31, 2019

    added 9 commits

    • 9e57450f...327aa8cc - 8 commits from branch master
    • 97167624 - Add information to place editor about reservedd, but not locked place

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jan 31, 2019
    Developer

    Build triggered.

  • Tuomas Riihimäki @tuomari

    added 3 commits

    • 97167624...e9b0113b - 2 commits from branch master
    • 71631cc7 - Add information to place editor about reservedd, but not locked place

    Compare with previous version

    Jan 31, 2019

    added 3 commits

    • 97167624...e9b0113b - 2 commits from branch master
    • 71631cc7 - Add information to place editor about reservedd, but not locked place

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jan 31, 2019
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/367/

  • Tuomas Riihimäki @tuomari

    merged

    Jan 31, 2019

    merged

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    mentioned in commit e29088ce

    Jan 31, 2019

    mentioned in commit e29088ce

    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
Tuukka Kivilahti
Assignee
Tuukka Kivilahti @tkfftk
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!427
×

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.