• 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 !293 opened 2017-02-23 08:43:36 UTC by李靖@lijing_yoho

修改订单详情页底部提示文字跟样式

Edited 2017-02-23 09:46:49 UTC
Request to merge hotfix/raffle into release/5.4.1
×

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/raffle origin/hotfix/raffle

Step 2. Review the changes locally

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

git checkout release/5.4.1
git merge --no-ff hotfix/raffle

Step 4. Push the result of the merge to GitLab

git push origin release/5.4.1

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-02-23 09:46:49 UTC

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

  • Discussion 0
  • Commits 3
  • Changes 6
  • 李靖
    @lijing_yoho 2017-02-23 09:46:32 UTC

    Added 1 commit:

    • 980551a5 - 订单详情页移除提示,支付完成增加提示
  • 毕凯
    @bikai 2017-02-23 09:46:49 UTC

    mentioned in commit 96566893

  • 毕凯
    @bikai 2017-02-23 09:46:49 UTC

    Status changed to merged

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

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.