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
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 828
    • Issues 828
    • 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
  • !349

Open
Opened 1 week ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (feat): ability for channels to self-declare nsfw

closes minds#486

depends on engine!202

Edited 6 days ago by Marcelo Rivera

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
git checkout -b eiennohi/front-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw 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 eiennohi/front-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw

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 eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw into master
The source branch is 40 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67217001 passed for 57de27eb on eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
    Requires approval from Devs. Approved by
    Emiliano Balbuena
    Emiliano Balbuena
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Brian Hatchet
    Brian Hatchet
    Ben Hayward
    Ben Hayward
    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

    Closes minds#486

    Deletes source branch

    • Discussion 7
    • Commits 2
    • Pipelines 5
    • Changes 5
    4/4 discussions resolved
    • Loading...
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a discussion on an old version of the diff 6 days ago
      Resolved by Marcelo Rivera 21 hours ago
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 6 days ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding · 6 days ago
      Owner

      @eiennohi can we check failing tests?

    • Marcelo Rivera @eiennohi added 1 commit 6 days ago

      added 1 commit

      • 6fec3245 - (feat): ability for channels to self-declare nsfw

      Compare with previous version

    • Marcelo Rivera @eiennohi mentioned in merge request engine!202 6 days ago

      mentioned in merge request engine!202

    • Marcelo Rivera @eiennohi changed the description 6 days ago

      changed the description

    • Ben Hayward @benhayward.ben approved this merge request 3 days ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 3 days ago
      Resolved by Marcelo Rivera 21 hours ago
    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 3 days ago
      Resolved by Marcelo Rivera 21 hours ago
    • Marcelo Rivera @eiennohi added 1 commit 1 day ago

      added 1 commit

      • 1bf492b4 - (feat): ability for channels to self-declare nsfw

      Compare with previous version

    • Marcelo Rivera @eiennohi added 1 commit 1 day ago

      added 1 commit

      • 03745c05 - (feat): ability for channels to self-declare nsfw

      Compare with previous version

    • Marcelo Rivera @eiennohi resolved all discussions 21 hours ago

      resolved all discussions

    • Emiliano Balbuena
      Emiliano Balbuena @edgebal started a discussion on an old version of the diff 21 hours ago
      Resolved by Marcelo Rivera 33 minutes ago
    • Marcelo Rivera @eiennohi added 1 commit 33 minutes ago

      added 1 commit

      • 57de27eb - (fix): formatting

      Compare with previous version

    • Marcelo Rivera @eiennohi resolved all discussions 33 minutes ago

      resolved all discussions

    • Emiliano Balbuena @edgebal approved this merge request 30 minutes 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
    None
    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
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    user avatar
    Emiliano Balbuena
    user avatar
    Marcelo Rivera
    Reference: minds/front!349