Skip to content
Snippets Groups Projects

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

Closed Marcelo Rivera requested to merge feat/self-declare-nsfw into master
All threads resolved!

Merge request reports

Checking pipeline status.

Requires 1 approval from Deployers.

Closed by Mark HardingMark Harding 4 years ago (Apr 15, 2021 8:23am UTC)

Merge details

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Mark Harding added 1 deleted label

    added 1 deleted label

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

  • Marcelo Rivera added 124 commits

    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 resolved all threads

    resolved all threads

  • Marcelo Rivera added 20 commits

    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 approved this merge request

    approved this merge request

  • 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.

  • mentioned in issue #1631 (closed)

  • Marcelo Rivera added 1 commit

    added 1 commit

    • bf1c086c - (revert): re-add nsfw selector

    Compare with previous version

  • Ben mentioned in merge request !432 (closed)

    mentioned in merge request !432 (closed)

  • closed

  • Please register or sign in to reply
    Loading