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 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 59
    • Merge Requests 59
  • 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
  • !341

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

(bug): Hotfix for opaque nsfw cover

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git 555-solid-background-nsfw-hotfix
git checkout -b benhayward.ben/front-555-solid-background-nsfw-hotfix 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 benhayward.ben/front-555-solid-background-nsfw-hotfix

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 benhayward.ben:555-solid-background-nsfw-hotfix into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65221869 passed for 0167bee3 on benhayward.ben:555-solid-background-nsfw-hotfix
    Requires 2 more approvals from Devs.
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Marcelo Rivera
    Marcelo Rivera
    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

    Deletes source branch

    • Discussion 0
    • Commits 3
    • Pipelines 3
    • Changes 1
    • Loading...
    • Ben Hayward @benhayward.ben added P - Messenger T - Feature labels 17 minutes ago

      added P - Messenger T - Feature labels

    • Ben Hayward @benhayward.ben added 1 commit 15 minutes ago

      added 1 commit

      • 0167bee3 - missed include

      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
    None
    Assign to
    None
    Milestone
    None
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    2
    Labels
    P - Messenger T - Feature
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Marcelo Rivera
    user avatar
    Ben Hayward
    Reference: minds/front!341