• 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 !1759 opened 2019-05-17 07:02:47 UTC by陈峰@chenfeng163

Release/6.9.4

Edited 2019-05-21 02:19:38 UTC
Request to merge release/6.9.4 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 release/6.9.4 origin/release/6.9.4

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 release/6.9.4

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 陈峰 2019-05-21 02:19:37 UTC

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

  • Discussion 0
  • Commits 46
  • Changes 25
  • 陈峰
    @chenfeng163 2019-05-17 07:12:13 UTC

    Added 2 commits:

    • 932d9965 - 修复吸顶不正常的问题
    • 82b605a2 - Merge branch 'feature/home-optimization' into 'release/6.9.4'
  • 陈峰
    @chenfeng163 2019-05-17 08:54:41 UTC

    Added 1 commit:

    • 0ff76653 - Update package.json
  • 陈峰
    @chenfeng163 2019-05-20 02:04:11 UTC

    Reassigned to @chenfeng163

  • 黄涛
    @huangtao 2019-05-20 03:04:03 UTC
    Developer

    Added 4 commits:

    • 77eff47d - fix shop url
    • cd207121 - fix css
    • c6205014 - update lib
    • e4f93be0 - Merge branch 'feature/newfeature' into release/6.9.4
  • 陈峰
    @chenfeng163 2019-05-20 05:34:28 UTC

    Added 6 commits:

    • 2621d990 - 数据曝光上报
    • 46ee26a5 - 上报效果修改, 添加点击商详上报事件
    • 2588920d - 添加商品数据上报
    • 8a28815e - Merge branch 'release/6.9.4' into feature/home-optimization
    • af36e5bf - 移除多余的声明
    • e527fc34 - Merge branch 'feature/home-optimization' into 'release/6.9.4'
  • 陈峰
    @chenfeng163 2019-05-20 05:34:45 UTC

    Added 1 commit:

    • 2f6ceaaa - Update package.json
  • 黄涛
    @huangtao 2019-05-20 06:44:24 UTC
    Developer

    Added 2 commits:

    • f2e14642 - fix shop url
    • efe5f83a - Merge remote-tracking branch 'origin/release/6.9.4' into release/6.9.4
  • 黄涛
    @huangtao 2019-05-20 08:09:49 UTC
    Developer

    Added 1 commit:

    • d0f37b3e - fix shop url
  • 陈峰
    @chenfeng163 2019-05-20 08:28:43 UTC

    Added 1 commit:

    • b93d0ad0 - Update package.json
  • 陈峰
    @chenfeng163 2019-05-20 08:56:03 UTC

    Added 2 commits:

    • ea41a3f2 - 修复无法跳转的问题
    • 030f27a2 - Merge branch 'feature/home-optimization' into 'release/6.9.4'
  • 陈峰
    @chenfeng163 2019-05-20 09:11:44 UTC

    Added 1 commit:

    • f9dec48d - Update package.json
  • 陈峰
    @chenfeng163 2019-05-21 02:19:37 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2019-05-21 02:19:38 UTC

    mentioned in commit 39d386f2

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

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.