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 157
    • Issues 157
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 40
    • Merge Requests 40
  • 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

Open
Opened 21 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
The source branch is 6 commits behind the target branch
Open in Web IDE
  • 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.
      Martin Santangelo
      Martin Santangelo
      Emiliano Balbuena
      Emiliano Balbuena
      Rami Albatal
      Rami Albatal
      Brian Hatchet
      Brian Hatchet
      Mark Harding
      Mark Harding
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request

      Allows commits from members who can merge to the target branch

      Closes #515

      Deletes source branch

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

        added 1 commit

        • de2c8dfd - (fix): spec tests

        Compare with previous version

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

        added 1 commit

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

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 20 hours ago

        added 1 commit

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

        Compare with previous version

      • Mark Harding @markeharding closed 19 hours ago

        closed

      • Marcelo Rivera @eiennohi resolved all discussions 7 minutes ago

        resolved all discussions

      • Marcelo Rivera @eiennohi reopened 3 minutes ago

        reopened

      • Ben Hayward
        Ben Hayward @benhayward.ben started a discussion on the diff 1 minute ago
        Controllers/api/v2/boost.php
        146 146 return Factory::response(array('status' => 'error', 'message' => ':guid must be passed in uri'));
        147 147 }
        148 148
        149
        • Ben Hayward
          Ben Hayward @benhayward.ben · 1 minute ago
          Developer

          Minor thing, but spacing here?

        Please register or sign in to reply
      • Ben Hayward
        Ben Hayward @benhayward.ben started a discussion on the diff just now
        Controllers/api/v2/boost.php
        289 291 ->setType(lcfirst($pages[0]))
        290 292 ->setPriority(false);
        291 293
        294 if ($manager->checkExisting($boost)) {
        295 return Factory::response([
        296 'status' => 'error',
        297 'message' => "There's already an ongoing boost for this entity"
        298 ]);
        299 }
        300
        • Ben Hayward
          Ben Hayward @benhayward.ben · just now
          Developer

          indentation is too far right here I think

        Please register or sign in to reply
      • 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
      Brian Hatchet
      user avatar
      Mark Harding
      user avatar
      Ben Hayward
      user avatar
      Marcelo Rivera
      Reference: minds/engine!209