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 797
    • Issues 797
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 62
    • Merge Requests 62
  • 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

Closed
Opened 3 weeks 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 (closed)

Edited 2 weeks 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
  • 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
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    Ben Hayward
    Ben Hayward

    Closed by Marcelo Rivera 14 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close minds#486

    Deletes source branch

    • Discussion 8
    • 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 2 weeks ago
      Resolved by Marcelo Rivera 2 weeks ago
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 weeks ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding · 2 weeks ago
      Owner

      @eiennohi can we check failing tests?

    • Marcelo Rivera @eiennohi added 1 commit 2 weeks 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 (closed) 2 weeks ago

      mentioned in merge request engine!202 (closed)

    • Marcelo Rivera @eiennohi changed the description 2 weeks ago

      changed the description

    • Ben Hayward @benhayward.ben approved this merge request 2 weeks ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 2 weeks ago
      Resolved by Marcelo Rivera 2 weeks ago
    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 2 weeks ago
      Resolved by Marcelo Rivera 2 weeks ago
    • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

      added 1 commit

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

      Compare with previous version

    • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

      added 1 commit

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

      Compare with previous version

    • Marcelo Rivera @eiennohi resolved all discussions 2 weeks ago

      resolved all discussions

    • Emiliano Balbuena
      Emiliano Balbuena @edgebal started a discussion on an old version of the diff 2 weeks ago
      Resolved by Marcelo Rivera 1 week ago
    • Marcelo Rivera @eiennohi added 1 commit 1 week ago

      added 1 commit

      • 57de27eb - (fix): formatting

      Compare with previous version

    • Marcelo Rivera @eiennohi resolved all discussions 1 week ago

      resolved all discussions

    • Emiliano Balbuena @edgebal approved this merge request 1 week ago

      approved this merge request

    • Mark Harding @markeharding added MR::Awaiting Review label 2 days ago

      added MR::Awaiting Review label

    • Marcelo Rivera
      Marcelo Rivera @eiennohi · 14 minutes ago
      Developer

      closing in favour of !414

    • Marcelo Rivera @eiennohi closed 14 minutes ago

      closed

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    user avatar
    Emiliano Balbuena
    Reference: minds/front!349