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

Publisher 自动合并请求 [p1cEZnASZI-7uo6ATEA0t]

auto deploy


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


feat: 新增命令


Merge branch 'feature/cuc' into test


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


feat: 照片模板新增登录


Merge branch 'feature/login' into test


Merge branch 'feature/login' into dev


Merge branch 'test' into 'dev'

Publisher 自动合并请求 [Jv2xGp2TlFTibrnwEYHki]

See merge request !102 (merged)


feat: 独立使用更改成功页


Merge branch 'feature/login' into test


Merge branch 'test' into 'dev'

Publisher 自动合并请求 [5JQnVY6IgMY__UHm8RmAf]

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

    added 2 commits

    • ab5cba35 - feat: 修复cname跳转错误的问题
    • f2dbebd8 - Merge branch 'feature/login' into dev

    Compare with previous version

    Sep 07, 2022

    added 2 commits

    • ab5cba35 - feat: 修复cname跳转错误的问题
    • f2dbebd8 - Merge branch 'feature/login' into dev

    Compare with previous version

    added 2 commits * ab5cba35 - feat: 修复cname跳转错误的问题 * f2dbebd8 - Merge branch 'feature/login' into dev [Compare with previous version](http://gitlab.aodianyun.com/activities/web-job/merge_requests/105/diffs?diff_id=5487&start_sha=71f449a1bc8f00b9bf66b0a38063adff08471cb9)
    Toggle commit list
  • 陆志强 @luzhiqiang

    added 2 commits

    • 02592dec - Merge branch 'feature/login' into test
    • af316194 - Merge branch 'test' into 'dev'

    Compare with previous version

    Sep 07, 2022

    added 2 commits

    • 02592dec - Merge branch 'feature/login' into test
    • af316194 - Merge branch 'test' into 'dev'

    Compare with previous version

    added 2 commits * 02592dec - Merge branch 'feature/login' into test * af316194 - Merge branch 'test' into 'dev' [Compare with previous version](http://gitlab.aodianyun.com/activities/web-job/merge_requests/105/diffs?diff_id=5490&start_sha=f2dbebd83631e5cac7c5cf4ebe680afdcfc5e691)
    Toggle commit list
  • 陆志强 @luzhiqiang

    merged

    Sep 07, 2022

    merged

    merged
    Toggle commit list
  • 陆志强 @luzhiqiang

    mentioned in commit 3d470d5e

    Sep 07, 2022

    mentioned in commit 3d470d5e

    mentioned in commit 3d470d5e0ef8111a961cab66c9fc7fb54bd410ad
    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!105
×

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.