Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 238
    • Issues 238
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !374

Open
Opened 32 minutes ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/PinkPanther](fix): Delete activity after moderation queue rejection #504

Closes #504

Summary

On production right now, if you reject a post in a group you moderate, the post no longer appears in the queue, but still shows up in the feed for mods only like so:

image

Testing

  1. Make a group, make it moderated.
  2. Login to a secondary account, create posts numbered 1, 2, 3, 4, 5.
  3. Log-in to primary account, look at the group, see the posts with "awaiting moderation"
  4. Go to the moderation queue and reject the post numbered 3.
  5. Check that the activity with the content '3' is not visible on the feed with its "awaiting moderation"

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "fix/delete-activity-mod-queue-504" "origin/fix/delete-activity-mod-queue-504"

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 "fix/delete-activity-mod-queue-504"

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 fix/delete-activity-mod-queue-504 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #89337800 canceled for 52f5c842 on fix/delete-activity-mod-queue-504
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Guy Thouret
          Guy Thouret
          Marcelo Rivera
          Marcelo Rivera
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #504

          Deletes source branch

          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 3
          • Loading...
          • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 32 minutes ago

            added MR::Awaiting Review Squad::Yellow scoped labels

          • 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::Awaiting Review Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Guy Thouret
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          Reference: minds/engine!374