Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 831
    • Issues 831
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !571

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

Open
Opened 2 hours 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 #84426230 passed with warnings for 53bede2d on hotfix/minds-pro-19.09.25-1
              Requires approval from Deployers. Approved by
              Juan Manuel Solaro
              Juan Manuel Solaro
              Ben Hayward
              Ben Hayward
              Olivia Madrid
              Olivia Madrid
              Brian Hatchet
              Brian Hatchet
              Mark Harding
              Mark Harding
              Guy Thouret
              Guy Thouret
              Marcelo Rivera
              Marcelo Rivera
              Depends on 1 merge request being merged
              • Opened 2 hours ago
                Sep 25, 2019 3:28pm GMT+0000
                (fix): Minds Pro staging feedback
                Opened 2 hours ago
                Sep 25, 2019 3:28pm GMT+0000
                engine !344
                Avatar for Emiliano Balbuena
                Assignee Emiliano Balbuena @edgebal
                Avatar for Emiliano Balbuena
                Assignee Emiliano Balbuena @edgebal
              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 4
              • Loading...
              • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 2 hours ago

                added Product::Pro Squad::Yellow scoped labels

              • Ben Hayward @benhayward.ben approved this merge request 1 hour ago

                approved this merge request

              • Juan Manuel Solaro @juanmsolaro approved this merge request 1 hour ago

                approved this merge request

              • 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
              9
              9 participants
              user avatar
              Olivia Madrid
              user avatar
              Brian Hatchet
              user avatar
              Mark Harding
              user avatar
              Guy Thouret
              user avatar
              Marcelo Rivera
              user avatar
              Martin Santangelo
              user avatar
              Emiliano Balbuena
              Reference: minds/front!571