Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • 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
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 197
    • Issues 197
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 40
    • Merge Requests 40
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !344

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 37 minutes ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(fix): Minds Pro staging feedback

Check out, review, and merge locally

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

git fetch origin
git checkout -b "hotfix/minds-pro-19.09.25-1" "origin/hotfix/minds-pro-19.09.25-1"

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 "hotfix/minds-pro-19.09.25-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 hotfix/minds-pro-19.09.25-1 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #84419721 passed for 0e32b640 on hotfix/minds-pro-19.09.25-1
          Requires 2 more approvals from Devs and Deployers.
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 37 minutes ago

            added Product::Pro Squad::Yellow scoped labels

          • 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
          2
          Labels
          Product::Pro Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          Reference: minds/engine!344