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

Open
Opened 20 hours ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

(fix): don't do anything if the entity isn't an image or video

closes #925

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/sentry-issue-925" "origin/fix/sentry-issue-925"

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/sentry-issue-925"

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/sentry-issue-925 into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #88921424 pending for e3bac422 on fix/sentry-issue-925
          Requires 3 more approvals from Devs, Deployers, and QA.
          Olivia Madrid
          Olivia Madrid
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Rami Albatal
          Rami Albatal
          Guy Thouret
          Guy Thouret
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #925

          Deletes source branch

          • Discussion 3
          • Commits 1
          • Pipelines 2
          • Changes 1
          0/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi changed milestone to %Misc. Q4 2019 20 hours ago

            changed milestone to %Misc. Q4 2019

          • Marcelo Rivera @eiennohi added Sprint::10/09 - Pink Panther Squad::Yellow scoped labels 20 hours ago

            added Sprint::10/09 - Pink Panther Squad::Yellow scoped labels

          • Mark Harding @markeharding added MR::Requires Changes scoped label 13 hours ago

            added MR::Requires Changes scoped label

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

            Linting issues @eiennohi

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 13 hours ago
            Last updated by Marcelo Rivera 7 minutes ago
            Controllers/api/v1/media.php
            36 36 return Factory::response(['status' => 'error']);
            37 37 }
            38 38
            39 if (!in_array(['object:video', 'object:image'], $entity->type)) {
            • Mark Harding
              Mark Harding @markeharding · 13 hours ago
              Owner

              type will always be object?

            • Marcelo Rivera @eiennohi changed this line in version 2 of the diff 8 minutes ago

              changed this line in version 2 of the diff

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

              Just fixed this line. I think the issue came from someone going into /media/:guid, with an activity guid instead of an image or video. That's why I'm doing the check

            • Please register or sign in to reply
          • Marcelo Rivera @eiennohi added 1 commit 8 minutes ago

            added 1 commit

            • e3bac422 - (fix): don't do anything if the entity isn't an image or video

            Compare with previous version

          • 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
          Misc. Q4 2019
          Milestone
          Misc. Q4 2019
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          3
          Labels
          MR::Requires Changes Sprint::10/09 - Pink Panther Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Olivia Madrid
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Rami Albatal
          user avatar
          Guy Thouret
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          Reference: minds/engine!365