• 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 !104 opened 2017-01-06 07:23:19 UTC by李靖@lijing_yoho

秒杀详情页无用代码

预设场景:该商品在秒杀开始前被加入购物车,在秒杀开始后进入购物车,当操作该订单时,跳到秒杀详情页 实际场景:该商品会在购物车置灰,提示订单已失效,不能结算

Edited 2017-01-06 07:30:01 UTC
Request to merge hotfix/seckills 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 hotfix/seckills origin/hotfix/seckills

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 hotfix/seckills

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-06 07:30:01 UTC

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

  • Discussion 0
  • Commits 1
  • Changes 1
  • 毕凯
    @bikai 2017-01-06 07:30:01 UTC

    mentioned in commit f687432a

  • 毕凯
    @bikai 2017-01-06 07:30:01 UTC

    Status changed to merged

  • Please register or login to post a comment
104 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!104
×

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.