• 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 !212 opened 2017-02-04 06:15:43 UTC by毕凯@bikai

Hotfix/sms login

  1. 升级 yas 版本
  2. 领券支持 jsonp
  3. 统计代码全局加载
  4. 未注册手机号,快捷登录的时候自动注册问题修改(主要改动)
Edited 2017-02-04 06:47:11 UTC
Request to merge hotfix/sms-login into master
×

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/sms-login origin/hotfix/sms-login

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff hotfix/sms-login

Step 4. Push the result of the merge to GitLab

git push origin master

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-04 06:47:11 UTC

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

  • Discussion 0
  • Commits 5
  • Changes 6
  • 毕凯
    @bikai 2017-02-04 06:47:11 UTC

    Status changed to merged

  • 毕凯
    @bikai 2017-02-04 06:47:11 UTC

    mentioned in commit 5f5e4971

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

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.