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

Closed
Opened 2 weeks ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Boost Campaigns module

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 goal/campaigns-1
git checkout -b edgebal/engine-goal/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-goal/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:goal/campaigns-1 into master
  • Email patches
  • Plain diff
Pipeline #68525596 failed for 466fa5ba on edgebal:goal/campaigns-1
        Checking approval status

        Closed by Emiliano Balbuena 40 minutes ago

        The changes were not merged into master

        Allows commits from members who can merge to the target branch

        Deletes source branch

        • Discussion 7
        • Commits 20
        • Pipelines 18
        • Changes 19
        • Loading...
        • 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
        1
        Labels
        MR::Awaiting Review
        Assign labels
        • View project labels
        Lock merge request
        Unlocked
        7
        7 participants
        user avatar
        Rami Albatal
        user avatar
        Brian Hatchet
        user avatar
        Marcelo Rivera
        user avatar
        Ben Hayward
        user avatar
        Mark Harding
        user avatar
        Martin Santangelo
        user avatar
        Emiliano Balbuena
        Reference: minds/engine!207