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 175
    • Issues 175
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 40
    • Merge Requests 40
  • 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
  • !241

Closed
Opened 3 weeks 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
  • Email patches
  • Plain diff
Pipeline #68856797 passed for cdcbd1b5 on fix/delete-activity-from-group-queue
          Requires 2 more approvals from Devs.
          Martin Santangelo
          Martin Santangelo
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena

          Closed by Marcelo Rivera 8 minutes ago

          The changes were not merged into master

          Did not close #504

          Deletes source branch

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

            mentioned in merge request !222 (closed)

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 weeks 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 · 2 weeks 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
          • Mark Harding @markeharding added MR::Requires Changes scoped label 2 weeks ago

            added MR::Requires Changes scoped label

          • Mark Harding @markeharding added Squad::Yellow scoped label 6 days ago

            added Squad::Yellow scoped label

          • Mark Harding
            Mark Harding @markeharding · 7 hours ago
            Owner

            @eiennohi please chase these MR's up..

          • Marcelo Rivera
            Marcelo Rivera @eiennohi · 8 minutes ago
            Developer

            @markeharding I actually forgot to close this MR, but we talked about this a few weeks back: I initially thought this feature was broken, as it didn't work when I tested it, but when you asked me to refactor this MR, I noticed this piece of code was already in place, and it was working: https://gitlab.com/minds/engine/blob/master/Core/Groups/Events.php#L109-126

          • Marcelo Rivera @eiennohi closed 8 minutes ago

            closed

          • 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
          7
          7 participants
          user avatar
          Martin Santangelo
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          Reference: minds/engine!241