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 889
    • Issues 889
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 56
    • Merge Requests 56
  • 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
  • !525

Open
Opened 35 minutes ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

Revert "Merge branch 'fix/tablet-group-chat-1477' into 'master'"

This reverts merge request !498 (merged)

Reverts #1477 fix attempt which needs to be readdressed

Edited 24 minutes ago by Brian Hatchet

Check out, review, and merge locally

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

git fetch origin
git checkout -b revert-9f4057ca origin/revert-9f4057ca

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 revert-9f4057ca

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 revert-9f4057ca into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78962366 running for d578b503 on revert-9f4057ca
              Merge request approved. Approved by
              Brian Hatchet
              Brian Hatchet
              Guy Thouret
              Guy Thouret
              Martin Santangelo
              Martin Santangelo
              Marcelo Rivera
              Marcelo Rivera
              Emiliano Balbuena
              Emiliano Balbuena
              Juan Manuel Solaro
              Juan Manuel Solaro

              Set by Mark Harding to be merged automatically when the pipeline succeeds

              The changes will be merged into master

              The source branch will be deleted

              Mentions #1477

              Deletes source branch

              • Discussion 0
              • Commits 1
              • Pipelines 1
              • Changes 1
              • Loading...
              • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Green scoped labels 33 minutes ago

                added MR::Awaiting Review Squad::Green scoped labels

              • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 31 minutes ago

                approved this merge request

              • Mark Harding @markeharding enabled an automatic merge when the pipeline for d578b503 succeeds 25 minutes ago

                enabled an automatic merge when the pipeline for d578b503 succeeds

              • Brian Hatchet :speech_balloon: @brianhatchet changed the description 24 minutes ago

                changed the description

              • 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
              0 Assignees
              None
              Assign to
              None
              Milestone
              None
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              2
              Labels
              MR::Awaiting Review Squad::Green
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Guy Thouret
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              user avatar
              Emiliano Balbuena
              user avatar
              Juan Manuel Solaro
              user avatar
              Mark Harding
              user avatar
              Olivia Madrid
              Reference: minds/front!525