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 !38 opened Aug 03, 2022 by 赖慧粮@laihuiliang 
  • Report abuse
Report abuse

Publisher 自动合并请求 [TaqslPdi_fSaK5PLTnHgN]

feat(config): 集成配置中心 & 统一全局变量名 & 统一工程命令


Merge branch 'feature/cbnclouds' into test


feat(cbnclouds): 私有环境接口统一线上接口规则


Merge branch 'feature/cbnclouds' into test


auto deploy


Merge branch 'feature/cbnclouds' into test


feat(config): update config


Merge branch 'feature/cbnclouds' into test


fix(login): 修复登录逻辑中错误未捕获的问题


Merge branch 'feature/cbnclouds' into test


feat: 新增手动设置抽奖


Merge branch 'feature/manual' into test


fix:修复抽奖状态改变时次数异常的情况


Merge branch 'feature/manual' into test


Merge branch 'feature/manual' into dev


Merge branch 'test' into 'dev'

Publisher 自动合并请求 [gs4RSWbEwikjcR5CKfLPb]

See merge request !37 (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 30
  • Changes 57
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陆志强 @luzhiqiang

    closed

    Aug 04, 2022

    closed

    closed
    Toggle commit list
  • 陆志强 @luzhiqiang

    reopened

    Aug 04, 2022

    reopened

    reopened
    Toggle commit list
  • 施嘉伟 @shijiawei

    added 1 commit

    • 86d1aa33 - fix(nuxtconfgi): 修复webpack-define-plugin挂载数据暴露ak的问题

    Compare with previous version

    Oct 07, 2022

    added 1 commit

    • 86d1aa33 - fix(nuxtconfgi): 修复webpack-define-plugin挂载数据暴露ak的问题

    Compare with previous version

    added 1 commit * 86d1aa33 - fix(nuxtconfgi): 修复webpack-define-plugin挂载数据暴露ak的问题 [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5638&start_sha=fcf5ef7952c52235847b371c67542dae9e94d92a)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 5 commits

    • 86d1aa33...2550bee2 - 2 commits from branch master
    • d1558963 - feat: 抽奖新增福袋、宝箱
    • e91fcc9b - feat: 样式更改
    • 1852220c - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    Oct 26, 2022

    added 5 commits

    • 86d1aa33...2550bee2 - 2 commits from branch master
    • d1558963 - feat: 抽奖新增福袋、宝箱
    • e91fcc9b - feat: 样式更改
    • 1852220c - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    added 5 commits * 86d1aa33...2550bee2 - 2 commits from branch `master` * d1558963 - feat: 抽奖新增福袋、宝箱 * e91fcc9b - feat: 样式更改 * 1852220c - Merge branch 'feature/newDraw' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5771&start_sha=86d1aa33e78985385f5a7186584bf233b466d16f)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 1 commit

    • ff054ffe - feat: 更新config版本

    Compare with previous version

    Oct 26, 2022

    added 1 commit

    • ff054ffe - feat: 更新config版本

    Compare with previous version

    added 1 commit * ff054ffe - feat: 更新config版本 [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5772&start_sha=1852220ca97350e98143bdb61e545e05392fa720)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 4 commits

    • ce6f971a - feat: 修复参与人数模式下的错误
    • 42fbe75f - feat: 修复抽奖记录、手动上线时间显示问题
    • 901a0414 - feat: 修复抽奖记录、手动上线时间显示问题
    • ecd06226 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    Oct 27, 2022

    added 4 commits

    • ce6f971a - feat: 修复参与人数模式下的错误
    • 42fbe75f - feat: 修复抽奖记录、手动上线时间显示问题
    • 901a0414 - feat: 修复抽奖记录、手动上线时间显示问题
    • ecd06226 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    added 4 commits * ce6f971a - feat: 修复参与人数模式下的错误 * 42fbe75f - feat: 修复抽奖记录、手动上线时间显示问题 * 901a0414 - feat: 修复抽奖记录、手动上线时间显示问题 * ecd06226 - Merge branch 'feature/newDraw' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5780&start_sha=ff054ffe479e21d9575eefe2e490bba8a25d3bce)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • f506751e - feat: 修复toast只弹一次的问题
    • 967b69a1 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    Oct 27, 2022

    added 2 commits

    • f506751e - feat: 修复toast只弹一次的问题
    • 967b69a1 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    added 2 commits * f506751e - feat: 修复toast只弹一次的问题 * 967b69a1 - Merge branch 'feature/newDraw' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5782&start_sha=ecd0622689484308fa442e48817c73f1da758296)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • 683e8ac6 - feat: 样式调整
    • 50e34d19 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    Nov 03, 2022

    added 2 commits

    • 683e8ac6 - feat: 样式调整
    • 50e34d19 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    added 2 commits * 683e8ac6 - feat: 样式调整 * 50e34d19 - Merge branch 'feature/newDraw' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5803&start_sha=967b69a1156752259dae309ff4fb4a6ad5794203)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 3 commits

    • 3aefc409 - feat: 样式调整
    • 9783b6ef - feat: 更改滚动条布局
    • 8bd86519 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    Nov 03, 2022

    added 3 commits

    • 3aefc409 - feat: 样式调整
    • 9783b6ef - feat: 更改滚动条布局
    • 8bd86519 - Merge branch 'feature/newDraw' into dev

    Compare with previous version

    added 3 commits * 3aefc409 - feat: 样式调整 * 9783b6ef - feat: 更改滚动条布局 * 8bd86519 - Merge branch 'feature/newDraw' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-lottery/merge_requests/38/diffs?diff_id=5805&start_sha=50e34d19d3edcc4899b9408bc0cda614ed0e3d36)
    Toggle commit list
  • 陆志强 @luzhiqiang

    merged

    Nov 03, 2022

    merged

    merged
    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
3
3 participants
Reference: activities/web-lottery!38