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
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 159
    • Issues 159
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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
  • !224

Open
Opened 2 hours ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

[Sprint/HappyHedgehog] (chore): Filter out campaigns when querying boosts

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/engine.git sprint.HipsterHedgehog/filter-out-campaigns-1
git checkout -b edgebal/engine-sprint.HipsterHedgehog/filter-out-campaigns-1 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 edgebal/engine-sprint.HipsterHedgehog/filter-out-campaigns-1

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 edgebal:sprint.HipsterHedgehog/filter-out-campaigns-1 into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67780300 passed for f437fd6e on edgebal:sprint.HipsterHedgehog/filter-out-campaigns-1
      Requires 2 more approvals from Devs.
      Mark Harding
      Mark Harding
      Martin Santangelo
      Martin Santangelo
      Marcelo Rivera
      Marcelo Rivera
      Rami Albatal
      Rami Albatal
      Brian Hatchet
      Brian Hatchet
      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

      Deletes source branch

      • Discussion 0
      • Commits 2
      • Pipelines 2
      • Changes 4
      • Loading...
      • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 hours ago

        approved this merge request

      • Emiliano Balbuena @edgebal added 1 commit 2 hours ago

        added 1 commit

        • f437fd6e - (wip): Skip campaigns when listing own boosts

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