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 !184 opened Jun 24, 2021 by 陈英杰@chenyingjie 
  • Report abuse
Report abuse

fix

  1. frame 地址跟随域名
×

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

    Status changed to merged

    Jun 24, 2021

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • 陈英杰 @chenyingjie

    mentioned in commit df564aa1

    Jun 24, 2021

    mentioned in commit df564aa1

    mentioned in commit df564aa11086341dec8f9aee1a4dc339e05ee2bf
    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
陈英杰 @chenyingjie
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: broadcast_cloud/web-live!184
×

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.