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

activities / web-lottery

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

Publisher 自动合并请求 [HjcKzHJTOsI8kSKRDfaQY]

fix(api): 网关地址修复


Merge branch 'private/cbnclouds' into test


Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test


feat(sentry): 增加sentry,记录开奖接口日志


chore(release): 1.2.1


auto deploy


合并分支 'test' 到 'dev'

Publisher 自动合并请求 [H_yixw8lchnJUkOM_QFnY]

fix(api): 网关地址修复


Merge branch 'private/cbnclouds' into test


Merge branch 'test' of gitlab.aodianyun.com:activities/web-lottery into test


feat(sentry): 增加sentry,记录开奖接口日志


查看合并请求 !24 (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 7
  • Changes 11
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 赖慧粮 @laihuiliang

    Status changed to merged

    Mar 15, 2022

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in commit 8bfe9e60

    Mar 15, 2022

    mentioned in commit 8bfe9e60

    mentioned in commit 8bfe9e60f79f0361287c648480513f9515696e1f
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in merge request !29 (merged)

    Apr 20, 2022

    mentioned in merge request !29 (merged)

    mentioned in merge request !29
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in commit c9f899a2

    Apr 21, 2022

    mentioned in commit c9f899a2

    mentioned in commit c9f899a28a072032de5bd6c5244d70e3b57851b0
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in merge request !32 (merged)

    Apr 21, 2022

    mentioned in merge request !32 (merged)

    mentioned in merge request !32
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in commit 6635d7bb

    Apr 26, 2022

    mentioned in commit 6635d7bb

    mentioned in commit 6635d7bbec816f0f04b034599fed20d70494963f
    Toggle commit list
  • 赖慧粮 @laihuiliang

    mentioned in merge request !37 (merged)

    Aug 03, 2022

    mentioned in merge request !37 (merged)

    mentioned in merge request !37
    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: activities/web-lottery!25
×

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.