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 863
    • Issues 863
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • 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
  • !481

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

WIP: Minds Pro (stable branch)

Depends on !481

Edited 5 hours ago by Mark Harding

Check out, review, and merge locally

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

git fetch origin
git checkout -b minds-pro-stable origin/minds-pro-stable

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 minds-pro-stable

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 minds-pro-stable into master
The source branch is 15 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77407289 passed with warnings for 0764c503 on minds-pro-stable
            Requires 2 more approvals from Devs and Deployers.
            Marcelo Rivera
            Marcelo Rivera
            Martin Santangelo
            Martin Santangelo
            Mark Harding
            Mark Harding
            Juan Manuel Solaro
            Juan Manuel Solaro
            Olivia Madrid
            Olivia Madrid
            There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

            Deletes source branch

            You can merge this merge request manually using the
            • Discussion 11
            • Commits 165
            • Pipelines 3
            • Changes 77
            • 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
            2
            Labels
            Product::Pro Squad::Yellow
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Marcelo Rivera
            user avatar
            Martin Santangelo
            user avatar
            Mark Harding
            user avatar
            Juan Manuel Solaro
            user avatar
            Olivia Madrid
            user avatar
            Guy Thouret
            user avatar
            Ben Hayward
            Reference: minds/front!481