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

activities / web-job

  • 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
Open
Merge request !107 opened Sep 07, 2022 by 赖慧粮@laihuiliang 
  • Report abuse
Report abuse

Publisher 自动合并请求 [KeTLRh-Qa1tlX-K5_7lyD]

×

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 23
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陆志强 @luzhiqiang

    added 4 commits

    • 2d9a8940 - feat: 新增直播间登录弹窗通讯
    • 39f25e58 - feat: 补全登录通讯
    • bb8c00ac - feat: 新增log文件
    • 50c34c4a - Merge branch 'feature/login' into dev

    Compare with previous version

    Jul 25, 2023

    added 4 commits

    • 2d9a8940 - feat: 新增直播间登录弹窗通讯
    • 39f25e58 - feat: 补全登录通讯
    • bb8c00ac - feat: 新增log文件
    • 50c34c4a - Merge branch 'feature/login' into dev

    Compare with previous version

    added 4 commits * 2d9a8940 - feat: 新增直播间登录弹窗通讯 * 39f25e58 - feat: 补全登录通讯 * bb8c00ac - feat: 新增log文件 * 50c34c4a - Merge branch 'feature/login' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=6839&start_sha=af31619468268074fa88e6f2897a41968671dcc1)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 1 commit

    • 0fbf0019 - feat: ignore log文件

    Compare with previous version

    Jul 25, 2023

    added 1 commit

    • 0fbf0019 - feat: ignore log文件

    Compare with previous version

    added 1 commit * 0fbf0019 - feat: ignore log文件 [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=6841&start_sha=50c34c4a2c5610aa3a5bc23083b633f1077a6d57)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 1 commit

    • 8fcc2371 - feat: 尝试修复打包

    Compare with previous version

    Jul 25, 2023

    added 1 commit

    • 8fcc2371 - feat: 尝试修复打包

    Compare with previous version

    added 1 commit * 8fcc2371 - feat: 尝试修复打包 [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=6842&start_sha=0fbf00190136f18d519b3f5bba3b06ff2ff9e0b1)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 1 commit

    • 223a0719 - feat: 更改config版本

    Compare with previous version

    Jul 25, 2023

    added 1 commit

    • 223a0719 - feat: 更改config版本

    Compare with previous version

    added 1 commit * 223a0719 - feat: 更改config版本 [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=6843&start_sha=8fcc237105d449fc464fcbfdc25f7b212574df12)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 16 commits

    • 223a0719...9c254453 - 14 commits from branch master
    • 6c290769 - feat: 页面跳转逻辑调整
    • 2167da03 - Merge branch 'feature/buttonName' into dev

    Compare with previous version

    Jan 24, 2024

    added 16 commits

    • 223a0719...9c254453 - 14 commits from branch master
    • 6c290769 - feat: 页面跳转逻辑调整
    • 2167da03 - Merge branch 'feature/buttonName' into dev

    Compare with previous version

    added 16 commits * 223a0719...9c254453 - 14 commits from branch `master` * 6c290769 - feat: 页面跳转逻辑调整 * 2167da03 - Merge branch 'feature/buttonName' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=7439&start_sha=223a0719cc9d28bd85efb10db3642e45829dc5ad)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • c4522d5a - feat: 新增融资情况
    • 81d7fc92 - Merge branch 'feature/buttonName' into dev

    Compare with previous version

    Jan 26, 2024

    added 2 commits

    • c4522d5a - feat: 新增融资情况
    • 81d7fc92 - Merge branch 'feature/buttonName' into dev

    Compare with previous version

    added 2 commits * c4522d5a - feat: 新增融资情况 * 81d7fc92 - Merge branch 'feature/buttonName' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=7444&start_sha=2167da0337e776afa2bd9709e895386786deeceb)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 6 commits

    • 81d7fc92...fbce2d1c - 4 commits from branch master
    • aae19bf9 - feat: 新增薪资单位
    • dc69a289 - Merge branch 'feature/unit' into dev

    Compare with previous version

    Apr 09, 2024

    added 6 commits

    • 81d7fc92...fbce2d1c - 4 commits from branch master
    • aae19bf9 - feat: 新增薪资单位
    • dc69a289 - Merge branch 'feature/unit' into dev

    Compare with previous version

    added 6 commits * 81d7fc92...fbce2d1c - 4 commits from branch `master` * aae19bf9 - feat: 新增薪资单位 * dc69a289 - Merge branch 'feature/unit' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=7555&start_sha=81d7fc928e3df90c83a9d432319df147a8995170)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 21 commits

    • 1e2879bb - Merge branch 'feature/login' into test
    • e5c03685 - Merge branch 'feature/login' into test
    • 45451f27 - Merge branch 'feature/login' into test
    • 3a35bcfd - feat: ignore log文件
    • ebc818b2 - Merge branch 'feature/login' into test
    • 205c246f - feat: 修复虚拟列表向上滚动bug
    • 7ee0ca1d - feat: 修复已知问题
    • 8d50d340 - Merge branch 'feature/scroll' into test
    • 8eb4a584 - Merge branch 'feature/buttonName' into test
    • fabe21e8 - Merge branch 'feature/buttonName' into test
    • 6c6a86f7 - feat: csr改造
    • 2e0e5398 - Merge branch 'feature/unit' into test
    • 71b9d087 - feat: 修改命令
    • 326f7c32 - feat: csr改造
    • 657e1aff - feat: 修复资源引入错我
    • f9038baa - feat: 修复docker错误
    • 9e10ff0e - feat: 修复引入资源错误
    • fab09707 - feat: 修复性别选项
    • 4cd05797 - feat: 同步代码
    • 142ceefd - Merge branch 'feature/csr' into test
    • 6f32c27a - Merge branch 'test' of gitlab.aodianyun.com:activities/web-job into dev

    Compare with previous version

    Feb 25, 2025

    added 21 commits

    • 1e2879bb - Merge branch 'feature/login' into test
    • e5c03685 - Merge branch 'feature/login' into test
    • 45451f27 - Merge branch 'feature/login' into test
    • 3a35bcfd - feat: ignore log文件
    • ebc818b2 - Merge branch 'feature/login' into test
    • 205c246f - feat: 修复虚拟列表向上滚动bug
    • 7ee0ca1d - feat: 修复已知问题
    • 8d50d340 - Merge branch 'feature/scroll' into test
    • 8eb4a584 - Merge branch 'feature/buttonName' into test
    • fabe21e8 - Merge branch 'feature/buttonName' into test
    • 6c6a86f7 - feat: csr改造
    • 2e0e5398 - Merge branch 'feature/unit' into test
    • 71b9d087 - feat: 修改命令
    • 326f7c32 - feat: csr改造
    • 657e1aff - feat: 修复资源引入错我
    • f9038baa - feat: 修复docker错误
    • 9e10ff0e - feat: 修复引入资源错误
    • fab09707 - feat: 修复性别选项
    • 4cd05797 - feat: 同步代码
    • 142ceefd - Merge branch 'feature/csr' into test
    • 6f32c27a - Merge branch 'test' of gitlab.aodianyun.com:activities/web-job into dev

    Compare with previous version

    added 21 commits * 1e2879bb - Merge branch 'feature/login' into test * e5c03685 - Merge branch 'feature/login' into test * 45451f27 - Merge branch 'feature/login' into test * 3a35bcfd - feat: ignore log文件 * ebc818b2 - Merge branch 'feature/login' into test * 205c246f - feat: 修复虚拟列表向上滚动bug * 7ee0ca1d - feat: 修复已知问题 * 8d50d340 - Merge branch 'feature/scroll' into test * 8eb4a584 - Merge branch 'feature/buttonName' into test * fabe21e8 - Merge branch 'feature/buttonName' into test * 6c6a86f7 - feat: csr改造 * 2e0e5398 - Merge branch 'feature/unit' into test * 71b9d087 - feat: 修改命令 * 326f7c32 - feat: csr改造 * 657e1aff - feat: 修复资源引入错我 * f9038baa - feat: 修复docker错误 * 9e10ff0e - feat: 修复引入资源错误 * fab09707 - feat: 修复性别选项 * 4cd05797 - feat: 同步代码 * 142ceefd - Merge branch 'feature/csr' into test * 6f32c27a - Merge branch 'test' of gitlab.aodianyun.com:activities/web-job into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=8271&start_sha=dc69a28997058c76ee1bd6dfaa72f43322722bf8)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • c066aee1 - feat: 样式微调
    • 28badec5 - Merge branch 'feature/csr' into dev

    Compare with previous version

    Feb 25, 2025

    added 2 commits

    • c066aee1 - feat: 样式微调
    • 28badec5 - Merge branch 'feature/csr' into dev

    Compare with previous version

    added 2 commits * c066aee1 - feat: 样式微调 * 28badec5 - Merge branch 'feature/csr' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=8272&start_sha=6f32c27a2fe50c3090cbb57f94e163cf38deeeb7)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 1 commit

    • cd0db78d - feat: 修复代码

    Compare with previous version

    Feb 25, 2025

    added 1 commit

    • cd0db78d - feat: 修复代码

    Compare with previous version

    added 1 commit * cd0db78d - feat: 修复代码 [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=8273&start_sha=28badec5b915d9d46fbd312210cacee4fee779e7)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • 5a18b777 - feat: 修复样式
    • 0127eff4 - Merge branch 'feature/csr' into dev

    Compare with previous version

    Feb 25, 2025

    added 2 commits

    • 5a18b777 - feat: 修复样式
    • 0127eff4 - Merge branch 'feature/csr' into dev

    Compare with previous version

    added 2 commits * 5a18b777 - feat: 修复样式 * 0127eff4 - Merge branch 'feature/csr' into dev [Compare with previous version](https://gitlab.aodianyun.com/activities/web-job/merge_requests/107/diffs?diff_id=8274&start_sha=cd0db78def2b56dd7d8ef28d3fb1a15653957ef3)
    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-job!107