• 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 !484 opened 2017-04-17 02:15:26 UTC by张孝茹@zhangxiaoru

防诈骗订单列表页遮盖问题

Edited 2017-04-17 04:27:30 UTC
Request to merge feature/fraud into release/5.6
×

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

Step 2. Review the changes locally

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

git checkout release/5.6
git merge --no-ff feature/fraud

Step 4. Push the result of the merge to GitLab

git push origin release/5.6

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-04-17 04:27:30 UTC

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

  • Discussion 0
  • Commits 4
  • Changes 3
  • 张孝茹
    @zhangxiaoru 2017-04-17 03:48:01 UTC
    Developer

    Added 1 commit:

    • 3f5518c1 - 订单列表页去除下载条
  • 张孝茹
    @zhangxiaoru 2017-04-17 04:00:03 UTC
    Developer

    Added 1 commit:

    • 9b079349 - 可能喜欢报错
  • 毕凯
    @bikai 2017-04-17 04:27:30 UTC

    mentioned in commit 2d7ef5e4

  • 毕凯
    @bikai 2017-04-17 04:27:30 UTC

    Status changed to merged

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

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.