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 !169 opened Apr 29, 2021 by 王含泽@wanghanze 
  • Report abuse
Report abuse

Publisher 自动合并请求 [rFi2OU7mga41RR5lk67u-]

feature

  1. 增加6种红包的区域限制提示

合并分支 'test' 到 'dev'

Publisher 自动合并请求 [LYBNHJFG9oFdKs_AkX5nw]

feature

  1. 增加6种红包的区域限制提示

查看合并请求 !168 (merged)


×

Check out, review, and merge locally

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

git fetch origin
git checkout -b dev origin/dev

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff dev

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.

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

    Status changed to merged

    Apr 29, 2021

    Status changed to merged

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

    mentioned in commit 047c1a1f

    Apr 29, 2021

    mentioned in commit 047c1a1f

    mentioned in commit 047c1a1f34dbcd26a03d7d98365616bc9888fdd1
    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!169
×

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.