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 !431 opened Feb 01, 2019 by Tuomas Riihimäki@tuomari

Add filter to user search to filter users with unused placeslots

Also noticed that a placeslot is generated also for automatically created place, when bill is paid, but the slot is not used. Code was changed not to create a placeslot and migration was added to lock placeslots for automatically created producucts

Edited Feb 01, 2019
Request to merge unused-placeslot-userfilter 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 unused-placeslot-userfilter origin/unused-placeslot-userfilter

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 unused-placeslot-userfilter

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.

Pipeline #167 passed
for 8d81c876.
Pipeline #167 passed with warnings
for 8d81c876.
Pipeline #167 skipped
for 8d81c876.
Pipeline #167 waiting for manual action
for 8d81c876.
Pipeline #167 canceled
for 8d81c876.
Pipeline #167 failed
for 8d81c876.
Pipeline #167 running
for 8d81c876.
Pipeline #167 pending
for 8d81c876.

Merged

  • The changes were merged into master.
  • Discussion 3
  • Commits 1
  • Pipelines 1
  • Changes 10
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Feb 01, 2019
    Developer

    Build triggered.

  • Jenkins @jenkins commented Feb 01, 2019
    Developer

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

  • Jenkins @jenkins commented Feb 01, 2019
    Developer

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

  • Tuukka Kivilahti @tkfftk

    mentioned in commit d3f8f960

    Feb 01, 2019

    mentioned in commit d3f8f960

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    merged

    Feb 01, 2019

    merged

    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
3
3 participants
Reference: codecrew/moya!431
×

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.