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 842
    • Issues 842
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 43
    • Merge Requests 43
  • 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
  • !414

Open
Opened 4 weeks ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

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

closes minds#486 (closed)

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/self-declare-nsfw origin/feat/self-declare-nsfw

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 feat/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 feat/self-declare-nsfw into master
The source branch is 4 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73789554 passed for 261296b0 on feat/self-declare-nsfw
          Requires approval from Deployers. Approved by
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes minds#486 (closed)

          Deletes source branch

          • Discussion 4
          • Commits 6
          • Pipelines 3
          • Changes 6
          1/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request !349 (closed) 4 weeks ago

            mentioned in merge request !349 (closed)

          • Marcelo Rivera @eiennohi mentioned in merge request engine!248 (merged) 4 weeks ago

            mentioned in merge request engine!248 (merged)

          • Ben Hayward
            Ben Hayward @benhayward.ben · 3 weeks ago
            Developer

            Link for the lazy: https://feat-self-declare-nsfw.minds.io/nemofin

            Declaring works fine, but I am unable to undeclare myself.

            image

          • Mark Harding @markeharding added MR::Requires Changes scoped label 2 weeks ago

            added MR::Requires Changes scoped label

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 weeks ago
            Resolved by Marcelo Rivera 1 week ago
          • Mark Harding @markeharding added Squad::Yellow scoped label 2 weeks ago

            added Squad::Yellow scoped label

          • Mark Harding
            Mark Harding @markeharding · 1 week ago
            Owner

            @eiennohi another one we need to follow up. Lets not forget about these.

          • Marcelo Rivera @eiennohi added 124 commits 1 week ago

            added 124 commits

            • 6278cb77...0d5fd361 - 122 commits from branch master
            • d20eee0d - Merge remote-tracking branch 'upstream/master' into feat/self-declare-nsfw
            • 5e631964 - (chore): only use the nsfw selector from the user dropdown

            Compare with previous version

          • Marcelo Rivera @eiennohi resolved all threads 1 week ago

            resolved all threads

          • Marcelo Rivera @eiennohi added 20 commits 1 day ago

            added 20 commits

            • 5e631964...7ea9e831 - 19 commits from branch master
            • 261296b0 - Merge remote-tracking branch 'upstream/master' into feat/self-declare-nsfw

            Compare with previous version

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

            approved this merge request

          • Mark Harding
            Mark Harding @markeharding · 12 minutes ago
            Owner

            We can't have two icon squashed together like this. Screen_Shot_2019-08-01_at_8.51.33_AM.

            Please put the nsfw selector in the channel editing section like the hashtags are.

          • 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::Requires Changes Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          Reference: minds/front!414