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 151
    • Issues 151
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 36
    • Merge Requests 36
  • 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
  • !200

Open
Opened 1 hour ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/FunnyFrog] (feat): don't allow to boost if already boosted

closes #449

Edited 43 minutes ago by Marcelo Rivera

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/FunnyFrog.feat.boost-changes
git checkout -b eiennohi/engine-sprint/FunnyFrog.feat.boost-changes 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/FunnyFrog.feat.boost-changes

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/FunnyFrog.feat.boost-changes into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66250221 (#970) running for f7629d1a on eiennohi:sprint/FunnyFrog.feat.boost-changes
      Checking approval status
      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 #449

      Deletes source branch

      • Discussion 0
      • Commits 4
      • Pipelines 8
      • Changes 5
      • Loading...
      • Marcelo Rivera @eiennohi added 41 commits 1 hour ago

        added 41 commits

        • 7d539ae9...08fca742 - 38 commits from branch minds:master
        • 32caacf1 - (feat): ability to attach tags to boosts
        • 4a64e5ef - (feat): spec tests
        • e689be85 - Merge remote-tracking branch 'upstream/master' into sprint/FunnyFrog.feat.boost-changes

        Compare with previous version

        Toggle commit list
      • Marcelo Rivera @eiennohi added 1 commit 52 minutes ago

        added 1 commit

        • 08f8fc90 - (feat): spec tests

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 50 minutes ago

        added 1 commit

        • 904a85f6 - (feat): don't allow to boost if there's already an ongoing boost

        Compare with previous version

      • Marcelo Rivera @eiennohi changed title from [Sprint/FunnyFrog] (feat): boost changes to [Sprint/FunnyFrog] (feat): don't allow to boost if already boosted 43 minutes ago

        changed title from [Sprint/FunnyFrog] (feat): boost changes to [Sprint/FunnyFrog] (feat): don't allow to boost if already boosted

      • Marcelo Rivera @eiennohi added 1 commit 22 minutes ago

        added 1 commit

        • a2d712c4 - (fix): simplified logic

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 17 minutes ago

        added 1 commit

        • b074beea - (fix): simplified logic

        Compare with previous version

      • Mark Harding @markeharding approved this merge request 13 minutes ago

        approved this merge request

      • Marcelo Rivera @eiennohi added 39 commits 12 minutes ago

        added 39 commits

        • b074beea...08fca742 - 38 commits from branch minds:master
        • fcd14cb7 - Merge remote-tracking branch 'upstream/master' into sprint/FunnyFrog.feat.boost-changes

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 2 minutes ago

        added 1 commit

        • f7629d1a - (fix): spec tests

        Compare with previous version

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