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
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 155
    • Issues 155
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • 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 2 hours 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 #66600229 (#981) passed for 277b5dcd on eiennohi:sprint/GiddyGiraffe.fix-boost-debiting-tokens-if-theres-already-an-ongoing-one
      Requires 2 more approvals from Devs.
      Emiliano Balbuena
      Emiliano Balbuena
      Ben Hayward
      Ben Hayward
      Martin Santangelo
      Martin Santangelo
      Mark Harding
      Mark Harding
      Rami Albatal
      Rami Albatal

      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 1
      • Commits 3
      • Pipelines 4
      • Changes 3
      0/1 discussion resolved
      • Loading...
      • Marcelo Rivera @eiennohi added 1 commit 1 hour ago

        added 1 commit

        • de2c8dfd - (fix): spec tests

        Compare with previous version

      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 hour ago
        Controllers/api/v2/boost.php
        287 296 ->setOwner(Core\Session::getLoggedInUser())
        288 297 ->setCreatedTimestamp(round(microtime(true) * 1000))
        289 298 ->setType(lcfirst($pages[0]))
        290 299 ->setPriority(false);
        • Mark Harding
          Mark Harding @markeharding · 1 hour ago
          Owner

          Can you move the check to below here and pass through ->checkExisting($boost)?

        Please register or sign in to reply
      • Marcelo Rivera @eiennohi added 1 commit 1 hour ago

        added 1 commit

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

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 1 hour ago

        added 1 commit

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

        Compare with previous version

      • 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
      Emiliano Balbuena
      user avatar
      Ben Hayward
      user avatar
      Martin Santangelo
      user avatar
      Mark Harding
      user avatar
      Rami Albatal
      user avatar
      Brian Hatchet
      user avatar
      Marcelo Rivera
      Reference: minds/engine!209