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 216
    • Issues 216
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 38
    • Merge Requests 38
  • 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
  • !302

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 4 weeks 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
The source branch is 56 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78670983 passed for 38aec539 on fix/nsfw-attachment-propegation-linted-1443
          Requires approval from Deployers. Approved by
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 2
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %"sprint: Lucky Lizard" 4 weeks ago

            changed milestone to %"sprint: Lucky Lizard"

          • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 4 weeks ago

            added Squad::Green scoped label

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 4 weeks ago
            Developer

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

          • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels and automatically removed Squad::Green label 3 hours ago

            added MR::Awaiting Review Squad::Yellow scoped labels and automatically removed Squad::Green label

          • Ben Hayward @benhayward.ben unassigned @benhayward.ben 3 hours ago

            unassigned @benhayward.ben

          • Ben Hayward @benhayward.ben approved this merge request 3 hours ago

            approved this merge request

          • Ben Hayward
            Ben Hayward @benhayward.ben · 3 hours ago
            Developer

            So thats where this card went! I hadn't received a notification for this.

          • 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
          (08/14) Lucky Lizard
          Milestone
          (08/14) Lucky Lizard
          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
          7
          7 participants
          user avatar
          Marcelo Rivera
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          user avatar
          Brian Hatchet
          Reference: minds/engine!302