Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 799
    • Issues 799
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !315

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

(fix): Change blocked user's content on remind notice (#1325)

image

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/front.git sprint/FunnyFrog.remind-message
git checkout -b edgebal/front-sprint/FunnyFrog.remind-message FETCH_HEAD

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 edgebal/front-sprint/FunnyFrog.remind-message

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 edgebal:sprint/FunnyFrog.remind-message into master
The source branch is 41 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #62672297 passed for ac873067 on edgebal:sprint/FunnyFrog.remind-message
    Merge request approved. Approved by
    Brian Hatchet
    Brian Hatchet
    Ben Hayward
    Ben Hayward
    Marcelo Rivera
    Marcelo Rivera
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request
    Allows commits from members who can merge to the target branch

    Mentions #1325

    Deletes source branch

    • Discussion 0
    • Commits 1
    • Pipelines 1
    • Changes 2
    • Loading...
    • Ben Hayward @benhayward.ben approved this merge request 13 hours ago

      approved this merge request

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 11 hours 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
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/front!315