• This project
    • Loading...
  • Sign in

fe / yohobuywap-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !1706 opened 2019-03-07 03:18:53 UTC by邱骏@qiuj

yoluck上线

Edited 2019-03-18 02:30:46 UTC
Request to merge hotfix/change-yoluck-interface into release/6.8.7
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b hotfix/change-yoluck-interface origin/hotfix/change-yoluck-interface

Step 2. Review the changes locally

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

git checkout release/6.8.7
git merge --no-ff hotfix/change-yoluck-interface

Step 4. Push the result of the merge to GitLab

git push origin release/6.8.7

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Merged by 陈峰 2019-03-18 02:30:46 UTC

The changes were merged into release/6.8.7. The source branch has been removed.

  • Discussion 0
  • Commits 40
  • Changes 54
  • 陈峰
    @chenfeng163 2019-03-07 03:22:43 UTC

    Added 1 commit:

    • 37aa7157 - Update package.json
  • 邱骏
    @qiuj 2019-03-07 06:04:32 UTC
    Developer

    Added 2 commits:

    • 6faa5a81 - 去掉log
    • ed25ff14 - Merge branch 'hotfix/change-yoluck-interface' of http://git.yoho.cn/fe/yohobuywa…
  • 邱骏
    @qiuj 2019-03-07 06:07:13 UTC
    Developer

    Added 1 commit:

    • bccb372c - 去掉log
  • 陈峰
    @chenfeng163 2019-03-07 09:37:12 UTC

    Added 1 commit:

    • cdd5bbaf - Update package.json
  • 陈峰
    @chenfeng163 2019-03-07 11:02:49 UTC

    Added 2 commits:

    • f65f51c4 - swtich yoluck back
    • 6c79cf31 - Merge branch 'feature/yoluck' into 'hotfix/change-yoluck-interface'
  • 陈峰
    @chenfeng163 2019-03-08 01:46:38 UTC

    Added 1 commit:

    • a7d97c18 - switch yoluck
  • 陈峰
    @chenfeng163 2019-03-08 01:47:30 UTC

    Added 1 commit:

    • 687d41eb - Update package.json
  • 陈峰
    @chenfeng163 2019-03-08 03:11:08 UTC

    Added 2 commits:

    • 4c66a05c - fix havegain apply
    • e8fe088a - Merge branch 'hotfix/change-yoluck-interface' of http://git.yoho.cn/fe/yohobuywa…
  • 陈峰
    @chenfeng163 2019-03-08 03:11:39 UTC

    Added 1 commit:

    • 2bbfed99 - Update package.json
  • 邱骏
    @qiuj 2019-03-08 03:48:43 UTC
    Developer

    Added 1 commit:

    • 8fce683b - 修改默认头像问题
  • 陈峰
    @chenfeng163 2019-03-08 03:50:37 UTC

    Added 1 commit:

    • 06f6ff3e - Update package.json
  • 邱骏
    @qiuj 2019-03-08 03:54:39 UTC
    Developer

    Added 2 commits:

    • 6c9f7cfb - update
    • 31c2ce8e - Merge branch 'hotfix/change-yoluck-interface' of http://git.yoho.cn/fe/yohobuywa…
  • 陈峰
    @chenfeng163 2019-03-18 02:09:05 UTC

    Target branch changed from master to release/6.8.7

  • 陈峰
    @chenfeng163 2019-03-18 02:09:23 UTC

    Changed title: 解决人名缩略展示、详情页不展示详情 → yoluck上线

  • 邱骏
    @qiuj 2019-03-18 02:14:12 UTC
    Developer

    Added 227 commits:

    • 31c2ce8e...3071b16e - 226 commits from branch release/6.8.7
    • 01dfda90 - merge
  • 陈峰
    @chenfeng163 2019-03-18 02:30:46 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2019-03-18 02:30:46 UTC

    mentioned in commit 2a2defad

  • Please register or login to post a comment
1706 of 1800
Prev Next
陈峰
Assignee
陈峰 @chenfeng163
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!1706
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.