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 !140 opened Apr 07, 2021 by 陈英杰@chenyingjie 
  • Report abuse
Report abuse

feature

  1. 升级svgaplayer-for-live
  2. 重置礼物倒计时
  3. 美化
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/feature_gift_v1.5.0 origin/feature/feature_gift_v1.5.0

Step 2. Review the changes locally

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

git checkout test
git merge --no-ff feature/feature_gift_v1.5.0

Step 4. Push the result of the merge to GitLab

git push origin test

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 1
  • Changes 9
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陈英杰 @chenyingjie

    mentioned in commit 25cbb1bd

    Apr 07, 2021

    mentioned in commit 25cbb1bd

    mentioned in commit 25cbb1bd48ed29cd70532d39702154fe7bf500bd
    Toggle commit list
  • 陈英杰 @chenyingjie

    Status changed to merged

    Apr 07, 2021

    Status changed to merged

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

    mentioned in merge request !145 (merged)

    Apr 13, 2021

    mentioned in merge request !145 (merged)

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

    mentioned in commit dd96ffd4

    Apr 13, 2021

    mentioned in commit dd96ffd4

    mentioned in commit dd96ffd48380a5bdaf7b9b195bdaa9be1f7021eb
    Toggle commit list
  • 王含泽 @wanghanze

    mentioned in merge request !152 (merged)

    Apr 13, 2021

    mentioned in merge request !152 (merged)

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

    mentioned in commit 323169b7

    Apr 13, 2021

    mentioned in commit 323169b7

    mentioned in commit 323169b71439c1482d8f9279d12b9660b28b5dd2
    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!140
×

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.