Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
fk-spider-web
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 周田
  • fk-spider-web
  • Merge Requests
  • !6

Merged
Opened Sep 15, 2025 by yzh@yezhonghan 
  • Report abuse
Report abuse

修改了任务信息页面的开关组件逻辑

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b yzh origin/yzh

Step 2. Review the changes locally

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

git checkout main
git merge --no-ff yzh

Step 4. Push the result of the merge to GitLab

git push origin main

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 6
  • Changes 35
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • yzh @yezhonghan

    added 1 commit

    • b323f506 - feat:完成了创建用户,用户列表接口。

    Compare with previous version

    Sep 16, 2025

    added 1 commit

    • b323f506 - feat:完成了创建用户,用户列表接口。

    Compare with previous version

    added 1 commit <ul><li>b323f506 - feat:完成了创建用户,用户列表接口。</li></ul> [Compare with previous version](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/6/diffs?diff_id=361&start_sha=5973f881c163978277a9abbd0b197ddd5d4d78c6)
    Toggle commit list
  • 周田 @zhoutian

    added 6 commits

    • b323f506...2d356fa8 - 5 commits from branch main
    • d7495360 - Merge branch 'main' into 'yzh'

    Compare with previous version

    Sep 16, 2025

    added 6 commits

    • b323f506...2d356fa8 - 5 commits from branch main
    • d7495360 - Merge branch 'main' into 'yzh'

    Compare with previous version

    added 6 commits <ul><li>b323f506...2d356fa8 - 5 commits from branch <code>main</code></li><li>d7495360 - Merge branch &#39;main&#39; into &#39;yzh&#39;</li></ul> [Compare with previous version](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/6/diffs?diff_id=363&start_sha=b323f50623df1a3dd76ff155b07e243518918f8c)
    Toggle commit list
  • 周田 @zhoutian

    mentioned in commit 55269de1

    Sep 16, 2025

    mentioned in commit 55269de1

    mentioned in commit 55269de1ce605925285b91ab32795fb3feb44a43
    Toggle commit list
  • 周田 @zhoutian

    merged

    Sep 16, 2025

    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
Reference: zhoutian/fk-spider-web!6
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.