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
  • !302

Open
Opened 27 minutes ago by Brian Hatchet@brianhatchet:speech_balloon:
  • 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-linted-1443 origin/fix/nsfw-attachment-propegation-linted-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-linted-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-linted-1443 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78670983 passed for 38aec539 on fix/nsfw-attachment-propegation-linted-1443
          Requires 2 more approvals from Devs and Deployers.
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 1
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Lucky Lizard 27 minutes ago

            changed milestone to %sprint: Lucky Lizard

          • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 27 minutes ago

            added Squad::Green scoped label

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 26 minutes ago
            Developer

            Recreated this MR since I made a mess of the other one's history

          • 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
          Ben Hayward's avatar Ben Hayward @benhayward.ben
          Assign to
          sprint: Lucky Lizard
          Milestone
          sprint: Lucky Lizard
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          user avatar
          Emiliano Balbuena
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Brian Hatchet
          Reference: minds/engine!302