Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
X
xiaomai-cloud-class-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
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • xiaomai-cloud-class
  • xiaomai-cloud-class-web
  • Merge Requests
  • !89

Merged
Opened Aug 11, 2021 by zhangleyuan@zhangleyuan 
  • Report abuse
Report abuse

feat:隐藏搜索接口

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/zhangleyuan/20210719/personnel-organization origin/feature/zhangleyuan/20210719/personnel-organization

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 feature/zhangleyuan/20210719/personnel-organization

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 3
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • zhangleyuan @zhangleyuan

    added 103 commits

    • b24bd04f...9e9c18a5 - 102 commits from branch master
    • 1df318b5 - feat:解决合并代码后的冲突

    Compare with previous version

    Aug 11, 2021

    added 103 commits

    • b24bd04f...9e9c18a5 - 102 commits from branch master
    • 1df318b5 - feat:解决合并代码后的冲突

    Compare with previous version

    added 103 commits * b24bd04f...9e9c18a5 - 102 commits from branch `master` * 1df318b5 - feat:解决合并代码后的冲突 [Compare with previous version](https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web/merge_requests/89/diffs?diff_id=7841&start_sha=b24bd04f481ac91f055beb57970c0c33362cd4c2)
    Toggle commit list
  • zhangleyuan @zhangleyuan

    added 1 commit

    • 4e3852e4 - feat:隐藏搜嗦

    Compare with previous version

    Aug 11, 2021

    added 1 commit

    • 4e3852e4 - feat:隐藏搜嗦

    Compare with previous version

    added 1 commit * 4e3852e4 - feat:隐藏搜嗦 [Compare with previous version](https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web/merge_requests/89/diffs?diff_id=7842&start_sha=1df318b5106ef4012ceb273c3b13f6fc3d1871c4)
    Toggle commit list
  • zhangleyuan @zhangleyuan

    merged

    Aug 11, 2021

    merged

    merged
    Toggle commit list
  • zhangleyuan @zhangleyuan

    mentioned in commit 54dd860c

    Aug 11, 2021

    mentioned in commit 54dd860c

    mentioned in commit 54dd860c096ebebe088d9bff0895e9016522bb09
    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
1
1 participant
Reference: xiaomai-cloud-class/xiaomai-cloud-class-web!89
×

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.