• 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 !234 opened 2017-02-13 09:19:45 UTC by陈峰@chenfeng163

Feature/wei binding

Edited 2017-02-16 06:34:49 UTC
Request to merge feature/weiBinding into gray
×

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

Step 2. Review the changes locally

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

git checkout gray
git merge --no-ff feature/weiBinding

Step 4. Push the result of the merge to GitLab

git push origin gray

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-16 06:34:49 UTC

The changes were merged into gray. The source branch has been removed.

  • Discussion 0
  • Commits 9
  • Changes 6
  • 张孝茹
    @zhangxiaoru 2017-02-14 03:06:40 UTC
    Developer

    Added 70 commits:

    • e914173f...945e1534 - 69 commits from branch gray
    • 3258a8f3 - merge form master
  • 张孝茹
    @zhangxiaoru 2017-02-14 03:18:31 UTC
    Developer

    Added 1 commit:

    • bfc19246 - 去除微信判断
  • 张孝茹
    @zhangxiaoru 2017-02-14 09:05:27 UTC
    Developer

    Added 1 commit:

    • c5322b88 - 取session中的信息
  • 张孝茹
    @zhangxiaoru 2017-02-15 03:14:52 UTC
    Developer

    Added 1 commit:

    • 5d5836ff - 第一次发送验证码
  • 陈峰
    @chenfeng163 2017-02-16 02:15:55 UTC

    Added 1 commit:

    • fb3f7f70 - 版本号
  • 陈峰
    @chenfeng163 2017-02-16 06:34:32 UTC

    Added 25 commits:

    • fb3f7f70...af0738c3 - 24 commits from branch gray
    • 8ca5c762 - 版本号
  • 陈峰
    @chenfeng163 2017-02-16 06:34:49 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2017-02-16 06:34:49 UTC

    mentioned in commit 79abee51

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

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.