Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project overview
  • Repository
  • Issues 403
  • Merge Requests 66
  • CI / CD
  • Security & Compliance
  • Packages
  • Analytics
  • Wiki
  • Snippets
  • Members
  • Collapse sidebar
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !768

Merged
Opened 1 week ago by Ben Hayward@benhayward.ben
Report abuse

Group explicit overlay #2402

  • Overview 11
  • Commits 23
  • Pipelines 9
  • Changes 9
5/5 threads resolved

Summary

Closes #2402 Depends on engine!458

Added in overlay for mature groups.

Steps to test

Quick test:

Test logged in and logged out that the overlay shows appropriately for these two groups.

NSFW
  • https://feat-group-mature-filter-2402.minds.io/groups/profile/1072258408465305612/feed
  • https://feat-group-mature-filter-2402.minds.io/nemofin/
Non nsfw
  • https://feat-group-mature-filter-2402.minds.io/groups/profile/1072258496726044686/feed
  • https://feat-group-mature-filter-2402.minds.io/minds

Thorough test:

  1. Make a new user (User A)
  2. With User A, make 2 groups. Call one nsfw and one non-nsfw.
  3. Log out, and in as the Minds admin account.
  4. Mark the nsfw group as NSFW using the dropdown (remember to refresh if you don't see the option).
  5. Refresh, it should show the overlay. - note down the URL
  6. Go to User A's channel, mark it as NSFW for Pornography / Nudity - note down the channel URL.
  7. Refresh the channel, you should see the explicit overlay.
  8. Switch it back, and refresh; you should not see the explicit overlay.
  9. Turn it back on and log out
  10. Check the channel, it should show overlay and should say that it is a channel.
  11. Check the group, it should also show overlay and should say that it is a group.

Estimated Regression Scope

This change affects the mature overlay in groups and on channels. In the worst circumstance, it could error out and cause issues showing the channel or group. It's also possible it could error out more subtly and show at inappropriate times (of-course I've definitely aimed for this NOT to happen).

Edited 5 days ago by Ben Hayward
Request to merge feat/group-mature-filter-2402 into master
Pipeline #119063659 passed with warnings for 4f1e65ab on feat/group-mature-filter-2402
              Merge request approved. Approved by
              Mark Harding Brian Hatchet
              Juan Manuel Solaro Emiliano Balbuena Marcelo Rivera Rami Albatal Xander Miller

              Merged by Xander Miller 1 hour ago

              The changes were merged into master with be6f5ebc

              The source branch has been deleted

              Pipeline #119245580 running for be6f5ebc on master
                              • Ben Hayward
                                Ben Hayward @benhayward.ben started a thread on an old version of the diff 1 week ago
                                Resolved by Emiliano Balbuena 6 days ago
                              • Ben Hayward @benhayward.ben added 2 commits 1 week ago

                                added 2 commits

                                • 6aa592e8 - Reverting package.json
                                • 2c98c6a6 - Fixed spec tests

                                Compare with previous version

                              • Ben Hayward @benhayward.ben added 1 commit 1 week ago

                                added 1 commit

                                • e45fe9d0 - Unneeded additon

                                Compare with previous version

                              • Ben Hayward @benhayward.ben changed the description 1 week ago

                                changed the description

                              • Ben Hayward @benhayward.ben added Squad::Yellow Status::Awaiting Review scoped labels 1 week ago

                                added scoped labels

                              • Ben Hayward @benhayward.ben added 1 commit 1 week ago

                                added 1 commit

                                • 7c81e856 - Missed a file

                                Compare with previous version

                              • Ben Hayward
                                Ben Hayward @benhayward.ben · 1 week ago
                                Developer

                                Feel free to use an existing user if Captcha is not working.

                              • Ben Hayward
                                Ben Hayward @benhayward.ben · 1 week ago
                                Developer

                                Looks like I didn't push the updates to channel

                              • Ben Hayward @benhayward.ben added 24 commits 1 week ago

                                added 24 commits

                                • 7c81e856...14445689 - 15 commits from branch master
                                • dfb73b7d - (wip): Containerized live server (not live, yet)
                                • f0f5d529 - (feat): Front live server
                                • b246238e - (refactor): Separate SSR live server and compiler
                                • ba9aef3f - (feat): Change deploy url
                                • fe2f400d - (chore): Add nodemon to front packages
                                • e8cbdbc1 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402
                                • 796a1d06 - Merge branch 'goal/local-infra' of gitlab.com:minds/front into feat/group-mature-filter-2402
                                • 2897c3b8 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402
                                • 7f8d2e32 - Missing parts

                                Compare with previous version

                                Toggle commit list
                                • Brian Hatchet
                                  Brian Hatchet :speech_balloon: @brianhatchet · 6 days ago
                                  Developer
                                  Resolved by Emiliano Balbuena 5 days ago

                                  @benhayward.ben We have merged in @edgebal 's changes. This has merge conflicts that need updating.

                                • Please register or sign in to reply
                              • Ben Hayward @benhayward.ben added 12 commits 6 days ago

                                added 12 commits

                                • 7f8d2e32...745769a5 - 11 commits from branch master
                                • f27e0f95 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402

                                Compare with previous version

                              • Ben Hayward @benhayward.ben changed the description 6 days ago

                                changed the description

                              • Ben Hayward @benhayward.ben changed the description 6 days ago

                                changed the description

                              • Emiliano Balbuena
                                Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
                                Resolved by Emiliano Balbuena 5 days ago
                              • Emiliano Balbuena
                                Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
                                Resolved by Ben Hayward 5 days ago
                              • Emiliano Balbuena
                                Emiliano Balbuena @edgebal started a thread on the diff 6 days ago
                                Resolved by Ben Hayward 5 days ago
                              • Emiliano Balbuena @edgebal added Status::Requires Changes scoped label and automatically removed Status::Awaiting Review label 6 days ago

                                added scoped label and automatically removed label

                              • Ben Hayward @benhayward.ben assigned to @benhayward.ben 6 days ago

                                assigned to @benhayward.ben

                              • Ben Hayward @benhayward.ben added 1 commit 5 days ago

                                added 1 commit

                                • fbb98f32 - Added i18n support to mature overlay

                                Compare with previous version

                              • Ben Hayward @benhayward.ben added 1 commit 5 days ago

                                added 1 commit

                                • 23b0779e - Reverting local dev stack change

                                Compare with previous version

                              • Ben Hayward @benhayward.ben changed the description 5 days ago

                                changed the description

                              • Emiliano Balbuena @edgebal resolved all threads 5 days ago

                                resolved all threads

                              • Emiliano Balbuena @edgebal approved this merge request 5 days ago

                                approved this merge request

                              • Emiliano Balbuena @edgebal added Status::Awaiting Review scoped label and automatically removed Status::Requires Changes label 5 days ago

                                added scoped label and automatically removed label

                              • Emiliano Balbuena
                                Emiliano Balbuena @edgebal · 5 days ago
                                Developer

                                Looking good!

                              • Mark Harding @markeharding approved this merge request 1 day ago

                                approved this merge request

                              • Mark Harding @markeharding added Status::Ready to Merge scoped label and automatically removed Status::Awaiting Review label 1 day ago

                                added scoped label and automatically removed label

                              • Xander Miller
                                Xander Miller @xander-miller · 20 hours ago
                                Developer

                                Looks good.

                              • Xander Miller @xander-miller approved this merge request 20 hours ago

                                approved this merge request

                              • Xander Miller
                                Xander Miller @xander-miller · 20 hours ago
                                Developer

                                Merge Conflicts

                              • Ben Hayward @benhayward.ben added 36 commits 16 hours ago

                                added 36 commits

                                • 23b0779e...18d19ab7 - 35 commits from branch master
                                • 4f1e65ab - Merge branch 'master' into 'feat/group-mature-filter-2402'

                                Compare with previous version

                              • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 15 hours ago

                                approved this merge request

                              • Mark Harding @markeharding approved this merge request 4 hours ago

                                approved this merge request

                              • Mark Harding @markeharding assigned to @xander-miller and unassigned @benhayward.ben 4 hours ago

                                assigned to @xander-miller and unassigned @benhayward.ben

                              • Xander Miller @xander-miller merged 1 hour ago

                                merged

                              • Xander Miller @xander-miller mentioned in commit be6f5ebc 1 hour ago

                                mentioned in commit be6f5ebc

                              Please register or sign in to reply
                              Assignee
                              Xander Miller's avatar
                              Xander Miller @xander-miller
                              None
                              Milestone
                              None
                              Time tracking
                              No estimate or time spent
                              2
                              Labels
                              Squad::Yellow Status::Ready to Merge
                              Lock merge request
                              Unlocked
                              10
                              10 participants
                              user avatar
                              user avatar
                              user avatar
                              user avatar
                              user avatar
                              user avatar
                              user avatar
                              Reference: minds/front!768