Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 153
    • Issues 153
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 38
    • Merge Requests 38
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !209

Closed
Opened 1 day ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (fix): shouldn't debit tokens if there's an ongoing boost

closes #515

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/engine.git sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one
git checkout -b eiennohi/engine-sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff eiennohi/engine-sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one

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.

Request to merge eiennohi:sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one into master
  • Email patches
  • Plain diff
Pipeline #66757376 failed for 42eea100 on eiennohi:sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one
      Requires approval from Devs. Approved by
      Ben Hayward
      Ben Hayward
      Martin Santangelo
      Martin Santangelo
      Emiliano Balbuena
      Emiliano Balbuena
      Rami Albatal
      Rami Albatal
      Mark Harding
      Mark Harding
      Brian Hatchet
      Brian Hatchet

      Closed by Mark Harding 1 hour ago

      The changes were not merged into master

      Allows commits from members who can merge to the target branch

      Did not close #515

      Deletes source branch

      • Discussion 4
      • Commits 4
      • Pipelines 5
      • Changes 3
      3/3 discussions resolved
      • Loading...
      • Marcelo Rivera @eiennohi added 1 commit 1 day ago

        added 1 commit

        • de2c8dfd - (fix): spec tests

        Compare with previous version

      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 day ago
        Resolved by Marcelo Rivera 22 hours ago
      • Marcelo Rivera @eiennohi added 1 commit 1 day ago

        added 1 commit

        • 55cdfed5 - (fix): checkExisting now takes the boost as parameter

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 1 day ago

        added 1 commit

        • 277b5dcd - (fix): checkExisting now takes the boost as parameter

        Compare with previous version

      • Mark Harding @markeharding closed 1 day ago

        closed

      • Marcelo Rivera @eiennohi resolved all discussions 22 hours ago

        resolved all discussions

      • Marcelo Rivera @eiennohi reopened 21 hours ago

        reopened

      • Ben Hayward
        Ben Hayward @benhayward.ben started a discussion on an old version of the diff 21 hours ago
        Resolved by Ben Hayward 21 hours ago
      • Ben Hayward
        Ben Hayward @benhayward.ben started a discussion on the diff 21 hours ago
        Resolved by Ben Hayward 21 hours ago
      • Ben Hayward @benhayward.ben approved this merge request 21 hours ago

        approved this merge request

      • Marcelo Rivera @eiennohi added 1 commit 21 hours ago

        added 1 commit

        • 42eea100 - (fix): formatting

        Compare with previous version

      • Ben Hayward @benhayward.ben resolved all discussions 21 hours ago

        resolved all discussions

      • Ben Hayward @benhayward.ben approved this merge request 21 hours ago

        approved this merge request

      • Mark Harding @markeharding closed 1 hour ago

        closed

      • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
      Please register or sign in to reply
      Assignee
      None
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      0
      Labels
      None
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      7
      7 participants
      user avatar
      Martin Santangelo
      user avatar
      Emiliano Balbuena
      user avatar
      Rami Albatal
      user avatar
      Mark Harding
      user avatar
      Brian Hatchet
      user avatar
      Ben Hayward
      user avatar
      Marcelo Rivera
      Reference: minds/engine!209