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 176
    • Issues 176
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • 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 114 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69273911 passed for 4ddbdb29 on feat/self-declare-nsfw
          Requires 2 more approvals from Devs and Deployers.
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          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 1
          • Commits 3
          • Pipelines 1
          • Changes 2
          0/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 1 week ago

            added Squad::Yellow scoped label

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on the diff 14 minutes ago
            Controllers/api/v1/channel.php
            222 222 }
            223 223 }
            224 224
            225 if (isset($_POST['nsfw']) && $_POST['nsfw']) {
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal · 14 minutes ago
              Developer

              This check is preventing users to unmark themselves, as the front will send [] and that's falsy.

              cc/ @eiennohi

              Edited by Emiliano Balbuena 13 minutes ago
            • Please register or sign in to reply
          • 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
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          Reference: minds/engine!248