• 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 !78 opened 2016-12-28 02:13:30 UTC by张孝茹@zhangxiaoru

删除我的收藏路径不对的图片

Edited 2016-12-28 02:58:45 UTC
Request to merge hotfix/favoriteBrand into release/5.3.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/favoriteBrand origin/hotfix/favoriteBrand

Step 2. Review the changes locally

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

git checkout release/5.3.1
git merge --no-ff hotfix/favoriteBrand

Step 4. Push the result of the merge to GitLab

git push origin release/5.3.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 毕凯 2016-12-28 02:58:45 UTC

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

  • Discussion 0
  • Commits 4
  • Changes 1
  • 张孝茹
    @zhangxiaoru 2016-12-28 02:19:01 UTC
    Developer

    Added 9 commits:

    • 616bab57 - fix
    • e9446ee6 - Merge branch 'hotfix/wap-im' into 'master'
    • fd20fe57 - add req.query
    • 15f32b72 - Merge branch 'hotfix/redbag'
    • 801dab45 - 人工客服 不在线提示,按后台配置来
    • ad7c0059 - fix
    • 20591087 - Merge branch 'hotfix/wap-im' into 'master'
    • f568aa98 - 客服图片暂时不能自适应
    • 72b64d56 - merge
  • 张孝茹
    @zhangxiaoru 2016-12-28 02:21:56 UTC
    Developer

    Added 3 commits:

    • 443b898a - Revert "客服图片暂时不能自适应"
    • 54b02c9a - Merge branch 'revert-f568aa98' into 'master'
    • bc8141ae - merge
  • 张孝茹
    @zhangxiaoru 2016-12-28 02:58:09 UTC
    Developer

    Added 1 commit:

    • 03d7e8f5 - 品牌
  • 毕凯
    @bikai 2016-12-28 02:58:45 UTC

    mentioned in commit 0d1573ca

  • 毕凯
    @bikai 2016-12-28 02:58:45 UTC

    Status changed to merged

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

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.