• 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 !131 opened 2017-01-12 02:51:25 UTC by张孝茹@zhangxiaoru

增加支付为0

Edited 2017-02-04 04:47:45 UTC
Request to merge feature/payEnd into release/5.4
×

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/payEnd origin/feature/payEnd

Step 2. Review the changes locally

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

git checkout release/5.4
git merge --no-ff feature/payEnd

Step 4. Push the result of the merge to GitLab

git push origin release/5.4

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 张孝茹 2017-01-12 03:31:16 UTC

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

  • Discussion 0
  • Commits 12
  • Changes 15
  • 张孝茹
    @zhangxiaoru 2017-01-12 03:12:23 UTC
    Developer

    Added 2 commits:

    • afaede94 - 简化
    • e5ad9ca0 - 简化
  • 张孝茹
    @zhangxiaoru 2017-01-12 03:17:45 UTC
    Developer

    Added 1 commit:

    • 7843bc89 - 修改路径名
  • 张孝茹
    @zhangxiaoru 2017-01-12 03:26:26 UTC
    Developer

    Added 518 commits:

    • 7843bc89...91989038 - 511 commits from branch release/5.4
    • 2b8f9c9f - fix image param q
    • 1c4626b4 - Merge branch 'release/wap-optim' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-optim
    • 94ed832a - orderdetail swiper css
    • 2591a9fe - 精减订单列表页css
    • f514840b - Merge branch 'release/wap-optim' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-optim
    • 76cc8ce1 - Merge branch 'release/wap-optim' into 'master'
    • 036f0618 - 冲突
  • 张孝茹
    @zhangxiaoru 2017-01-12 03:31:16 UTC
    Developer

    Status changed to merged

  • Please register or login to post a comment
131 of 1800
Prev Next
毕凯
Assignee
毕凯 @bikai
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!131