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 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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 2 weeks ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

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

closes minds#486

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 121 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69273745 passed for 6278cb77 on feat/self-declare-nsfw
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Closes minds#486

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 3
          • Commits 3
          • Pipelines 1
          • Changes 5
          0/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request !349 (closed) 2 weeks ago

            mentioned in merge request !349 (closed)

          • Marcelo Rivera @eiennohi mentioned in merge request engine!248 2 weeks ago

            mentioned in merge request engine!248

          • Ben Hayward
            Ben Hayward @benhayward.ben · 2 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 1 week ago

            added MR::Requires Changes scoped label

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 1 week ago
            src/app/modules/channels/sidebar/sidebar.html
            71 71 </div>
            72 72 </div>
            73 73
            74 <div class="m-channel-bio-editor m-channel-nsfw-editor" *ngIf="editing && isOwner()">
            • Mark Harding
              Mark Harding @markeharding · 1 week ago
              Owner

              Can this be moved to the user dropdown menu?

            • Please register or sign in to reply
          • Mark Harding @markeharding added Squad::Yellow scoped label 6 days ago

            added Squad::Yellow scoped label

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

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

          • 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
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          Reference: minds/front!414