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 864
    • Issues 864
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • 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
  • !486

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

WIP: (feat): Minds Pro (development branch) - Release 2

Check out, review, and merge locally

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

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

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/minds-pro-stable
git merge --no-ff epic/minds-pro

Step 4. Push the result of the merge to GitLab

git push origin minds-pro-stable

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 epic/minds-pro into minds-pro-stable
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #75284654 failed for e601de33 on epic/minds-pro
          Requires 2 more approvals from Devs and Deployers.
          Guy Thouret
          Guy Thouret
          Martin Santangelo
          Martin Santangelo
          Juan Manuel Solaro
          Juan Manuel Solaro
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          This is a Work in Progress
          You can merge this merge request manually using the
          • Discussion 0
          • Commits 9
          • Pipelines 7
          • Changes 17
          • Loading...
          • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 7 hours ago

            added Product::Pro Squad::Yellow scoped labels

          • Juan Manuel Solaro @juanmsolaro added 1 commit 7 hours ago

            added 1 commit

            • cc328524 - (feat) Add ellipsis menu that contains common channel actions

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 5 hours ago

            added 1 commit

            • 4e8253fb - (wip): Pro home

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 2 hours ago

            added 1 commit

            • d51cd653 - (feat): added background overlay colour

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 1 hour ago

            added 1 commit

            • e601de33 - (feat): only show categories underneath navbar if we're on a list view

            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
          2
          Labels
          Product::Pro Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          9
          9 participants
          user avatar
          Guy Thouret
          user avatar
          Martin Santangelo
          user avatar
          Juan Manuel Solaro
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          Reference: minds/front!486