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 238
    • Issues 238
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 42
    • Merge Requests 42
  • 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
  • !373

Open
Opened 21 minutes ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

WIP: 1080p encoding for pro

closes #964

Check out, review, and merge locally

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

git fetch origin
git checkout -b "feat/1080p-encoding-for-pro" "origin/feat/1080p-encoding-for-pro"

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 "feat/1080p-encoding-for-pro"

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 feat/1080p-encoding-for-pro into master
The source branch is 11 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #89304450 running for 0e28a2da on feat/1080p-encoding-for-pro
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Guy Thouret
          Guy Thouret
          This is a Work in Progress

          Closes #964

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 0
          • Commits 7
          • Pipelines 4
          • Changes 7
          • Loading...
          • Marcelo Rivera @eiennohi added Product::Pro Sprint::10/09 - Pink Panther Squad::Yellow scoped labels 21 minutes ago

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

          • Marcelo Rivera @eiennohi added 2 commits 16 minutes ago

            added 2 commits

            • 987a52fb - (fix): spec tests
            • 0e28a2da - (fix): lint

            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
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          3
          Labels
          Product::Pro Sprint::10/09 - Pink Panther Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Guy Thouret
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          Reference: minds/engine!373