Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

broadcast_cloud / web-live

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 2
  • Pipelines
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !176 opened May 31, 2021 by 王含泽@wanghanze 
  • Report abuse
Report abuse

Publisher 自动合并请求 [99UKxe7QN0oh9aZK0IepO]

feaure

  1. 直播间支持vr直播

Merge branch 'test' of gitlab.aodianyun.com:broadcast_cloud/web-live into test


feature

  1. 横屏直播支持vr

Merge branch 'dev' into test


Merge branch 'dev' into test


feat

  1. pc、横屏竖屏均支持vr直播

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b test origin/test

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout dev
git merge --no-ff test

Step 4. Push the result of the merge to GitLab

git push origin dev

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 6
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陈英杰 @chenyingjie

    mentioned in commit e5173538

    May 31, 2021

    mentioned in commit e5173538

    mentioned in commit e51735385256aaf54526aac255da83a0400d6f95
    Toggle commit list
  • 陈英杰 @chenyingjie

    Status changed to merged

    May 31, 2021

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • 王含泽 @wanghanze

    mentioned in merge request !177 (merged)

    May 31, 2021

    mentioned in merge request !177 (merged)

    mentioned in merge request !177
    Toggle commit list
  • 陈英杰 @chenyingjie

    mentioned in commit 7d486fa8

    May 31, 2021

    mentioned in commit 7d486fa8

    mentioned in commit 7d486fa8306f563921e4aea63574795e2918420e
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: broadcast_cloud/web-live!176
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.