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 136
    • Issues 136
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !241

Open
Opened 3 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (fix): when deleting activity, also remove from moderated group queue

closes #504

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-from-group-queue origin/fix/delete-activity-from-group-queue

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-from-group-queue

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-from-group-queue into master
The source branch is 22 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68856797 passed for cdcbd1b5 on fix/delete-activity-from-group-queue
          Requires 2 more approvals from Devs.
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Mark Harding
          Mark Harding
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #504

          Deletes source branch

          • Discussion 1
          • Commits 2
          • Pipelines 1
          • Changes 1
          0/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request !222 (closed) 3 days ago

            mentioned in merge request !222 (closed)

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 1 hour ago
            Controllers/api/v1/newsfeed.php
            785 786 // remove from pinned
            786 787 $owner->removePinned($activity->guid);
            787 788
            789 // if it was posted to a group
            • Mark Harding
              Mark Harding @markeharding · 1 hour ago
              Owner

              Can you do an event hook, listening for delete instead. Newsfeed.php is already too big with too much logic, and we have the events already

            • 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
          Assignee
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          0
          Labels
          None
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Marcelo Rivera
          Reference: minds/engine!241