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 !432 opened Feb 06, 2019 by Tuukka Kivilahti@tkfftk

Fixed bug which count's every selected product 2 times when using global billed limit

Local basket count is calculated in view, so no need to recalculate it in bean.

Other limit's work with the logic that view removes bascet amounts from limits

Edited Nov 16, 2019
Request to merge global_billed_fix 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 global_billed_fix origin/global_billed_fix

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 global_billed_fix

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 #169 passed
for 9e7069a1.
Pipeline #169 passed with warnings
for 9e7069a1.
Pipeline #169 skipped
for 9e7069a1.
Pipeline #169 waiting for manual action
for 9e7069a1.
Pipeline #169 canceled
for 9e7069a1.
Pipeline #169 failed
for 9e7069a1.
Pipeline #169 running
for 9e7069a1.
Pipeline #169 pending
for 9e7069a1.

Merged

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

    Build triggered.

  • Jenkins @jenkins commented Feb 06, 2019
    Developer

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

  • Jenkins @jenkins commented Feb 06, 2019
    Developer

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

  • Tuomas Riihimäki @tuomari

    merged

    Nov 16, 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!432