Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 883
    • Issues 883
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 49
    • Merge Requests 49
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !587

Open
Opened 44 minutes ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/PinkPanther](fix): Upload cancelling #2083

Closes #2083 Credits to Mark for the elegant solution

Summary

Upload cancellation is broken on production. Go upload a video on it and try to cancel it.

Test

  1. Upload a video, & whilst uploading, upload a second video - it should replace the existing upload, progress bar should not jump erratically.
  2. Try cancelling the upload. it should cancel. - Without a refresh, try to upload a second video.
  3. Uploading a video should complete all the way and post.
  4. Should not interfere with image upload.
Edited 40 minutes ago by Ben Hayward

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/upload-cancel-2083" "origin/fix/upload-cancel-2083"

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/upload-cancel-2083"

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/upload-cancel-2083 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #88331832 failed for 9483040f on fix/upload-cancel-2083
              Requires 3 more approvals from Devs, Deployers, and QA.
              Mark Harding
              Mark Harding
              Brian Hatchet
              Brian Hatchet
              Emiliano Balbuena
              Emiliano Balbuena
              Xander Miller
              Xander Miller
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Closes #2083

              Deletes source branch

              • Discussion 0
              • Commits 4
              • Pipelines 4
              • Changes 1
              • Loading...
              • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 44 minutes ago

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

              • Ben Hayward @benhayward.ben changed the description 40 minutes ago

                changed the description

              • 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::Yellow
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              Juan Manuel Solaro
              user avatar
              Martin Santangelo
              user avatar
              Mark Harding
              user avatar
              Brian Hatchet
              user avatar
              Marcelo Rivera
              user avatar
              Emiliano Balbuena
              user avatar
              Olivia Madrid
              Reference: minds/front!587