Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 193
    • Issues 193
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 29
    • Merge Requests 29
  • 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 Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !248

Merged
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)

depends on front!414

Request to merge feat/self-declare-nsfw into master
  • Email patches
  • Plain diff
Pipeline #73942240 passed for 19d8f7f7 on feat/self-declare-nsfw
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Brian Hatchet
          Brian Hatchet

          Merged by Mark Harding 10 minutes ago

          The changes were merged into master with b50c93d2

          The source branch has been deleted

          Closed minds#486 (closed)

          Pipeline #74091059 running for b50c93d2 on master
                      • Discussion 2
                      • Commits 5
                      • Pipelines 2
                      • Changes 2
                      1/1 thread resolved
                      • Loading...
                      • Marcelo Rivera @eiennohi mentioned in merge request !202 (closed) 4 weeks ago

                        mentioned in merge request !202 (closed)

                      • Mark Harding @markeharding added Squad::Yellow scoped label 2 weeks ago

                        added Squad::Yellow scoped label

                      • Emiliano Balbuena
                        Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 day ago
                        Resolved by Marcelo Rivera 19 hours ago
                      • Marcelo Rivera @eiennohi added 118 commits 19 hours ago

                        added 118 commits

                        • 4ddbdb29...0e644a34 - 116 commits from branch master
                        • 2e70d9d7 - Merge remote-tracking branch 'upstream/master' into feat/self-declare-nsfw
                        • 19d8f7f7 - (fix): allow users to remove all non-locked nsfw tags

                        Compare with previous version

                      • Marcelo Rivera @eiennohi resolved all threads 19 hours ago

                        resolved all threads

                      • Mark Harding @markeharding approved this merge request 10 minutes ago

                        approved this merge request

                      • Mark Harding @markeharding merged 10 minutes ago

                        merged

                      • Mark Harding @markeharding mentioned in commit b50c93d2 10 minutes ago

                        mentioned in commit b50c93d2

                      • 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
                      1
                      Labels
                      Squad::Yellow
                      Assign labels
                      • View project labels
                      Lock merge request
                      Unlocked
                      7
                      7 participants
                      user avatar
                      Emiliano Balbuena
                      user avatar
                      Martin Santangelo
                      user avatar
                      Ben Hayward
                      user avatar
                      Rami Albatal
                      user avatar
                      Brian Hatchet
                      user avatar
                      Mark Harding
                      user avatar
                      Marcelo Rivera
                      Reference: minds/engine!248

                      Revert this merge request

                      This will create a new commit in order to revert the existing changes.

                      Switch branch
                      Cancel
                      A new branch will be created in your fork and a new merge request will be started.

                      Cherry-pick this merge request

                      Switch branch
                      Cancel
                      A new branch will be created in your fork and a new merge request will be started.