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

Open
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 front!414

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 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73942240 passed for 19d8f7f7 on feat/self-declare-nsfw
          Requires 2 more approvals from Devs and Deployers.
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes minds#486

          Deletes source branch

          • Discussion 2
          • Commits 5
          • Pipelines 2
          • Changes 2
          1/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request !202 (closed) 3 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 21 hours ago
            Resolved by Marcelo Rivera 2 hours ago
          • Marcelo Rivera @eiennohi added 118 commits 2 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 2 hours ago

            resolved all threads

          • 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
          Mark Harding
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          Reference: minds/engine!248