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

Closed
Opened 3 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/LuckyLizard](fix): Moved nsfw entity/attachment propegation so it executes.

If this is set before execution of $attachment->setNsfw($activity->getNsfw());

Then the activity->getNsfw() returns null, and thus it isn't set.

Both of these occurrences appear to be unneeded as the change works.

image

Note

I am not able to discern why this was called twice to start with, so this will need thorough testing.

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/nsfw-attachment-propegation-1443 origin/fix/nsfw-attachment-propegation-1443

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/nsfw-attachment-propegation-1443

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/nsfw-attachment-propegation-1443 into master
  • Email patches
  • Plain diff
Pipeline #78668033 passed for 1a77601e on fix/nsfw-attachment-propegation-1443
          Requires 2 more approvals from Devs and Deployers.
          Brian Hatchet
          Brian Hatchet
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Rami Albatal
          Rami Albatal

          Closed by Brian Hatchet 25 minutes ago

          The changes were not merged into master

          Deletes source branch

          • Discussion 0
          • Commits 7
          • Pipelines 6
          • Changes 120
          • Loading...
          • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Green scoped labels 3 days ago

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

          • Brian Hatchet :speech_balloon: @brianhatchet added 7 commits 1 hour ago

            added 7 commits

            • fe44502f...8e6942b6 - 6 commits from branch master
            • 5c21fd6a - Merge remote-tracking branch 'origin/master' into fix/nsfw-attachment-propegation-1443

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 49 minutes ago

            added 1 commit

            • ac178e05 - Lint commit

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 48 minutes ago

            added 1 commit

            • 5f22ccd7 - Revert "Lint commit"

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 2 commits 42 minutes ago

            added 2 commits

            • f92bb0b9 - Revert "Merge remote-tracking branch 'origin/master' into fix/nsfw-attachment-propegation-1443"
            • ba309177 - CS lint before merging in origin master

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 39 minutes ago

            added 1 commit

            • 1a77601e - Revert "Revert "Merge remote-tracking branch 'origin/master' into...

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet closed 26 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::Awaiting Review Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          user avatar
          Emiliano Balbuena
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          Reference: minds/engine!298