Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 821
    • Issues 821
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 61
    • Merge Requests 61
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !344

Closed
Opened 2 days ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

(fix) Better transcoding error message

If the direct source video fails to play, it calls the fallback. The fallback calls the transcoding endpoint which verifies that there is a source file. If the source file has been deleted, it will return a "This video has been deleted..." error. It will also return the list of transcodes in the response.

This goes with this backend MR engine!194 (merged)

Fixing #912 (closed)

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/brianhatchet/front.git transcoding_status
git checkout -b brianhatchet/front-transcoding_status FETCH_HEAD

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 brianhatchet/front-transcoding_status

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 brianhatchet:transcoding_status into master
  • Email patches
  • Plain diff
Pipeline #65570863 (#100) passed for db1d7006 on brianhatchet:transcoding_status
    Merge request approved. Approved by
    Ben Hayward
    Ben Hayward
    Marcelo Rivera
    Marcelo Rivera
    Mark Harding
    Mark Harding
    Emiliano Balbuena
    Emiliano Balbuena
    Martin Santangelo
    Martin Santangelo

    Closed by Mark Harding 3 hours ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #912 (closed)

    Deletes source branch

    • Discussion 1
    • Commits 1
    • Pipelines 1
    • Changes 2
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Giddy Giraffe 2 days ago

      changed milestone to %sprint: Giddy Giraffe

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet · 2 days ago
      Maintainer

      @benhayward.ben FYI

    • Marcelo Rivera @eiennohi approved this merge request 1 day ago

      approved this merge request

    • Ben Hayward @benhayward.ben approved this merge request 1 day ago

      approved this merge request

    • Mark Harding @markeharding closed 3 hours 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
    Assignee
    Brian Hatchet's avatar Brian Hatchet @brianhatchet
    Assign to
    sprint: Giddy Giraffe
    Milestone
    sprint: Giddy Giraffe
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Mark Harding
    user avatar
    Emiliano Balbuena
    user avatar
    Martin Santangelo
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    Reference: minds/front!344