• 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 !1708 opened 2019-03-13 03:28:14 UTC by陈峰@chenfeng163

Feature/group buy

Edited 2019-03-13 05:59:04 UTC
Request to merge feature/group-buy into release/313
×

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/group-buy origin/feature/group-buy

Step 2. Review the changes locally

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

git checkout release/313
git merge --no-ff feature/group-buy

Step 4. Push the result of the merge to GitLab

git push origin release/313

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-03-13 05:59:03 UTC

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

  • Discussion 2
  • Commits 194
  • Changes 80
  • Avatar
    陈峰
    @chenfeng163 started a discussion on the diff 2019-03-13 03:40:15 UTC
    Toggle discussion
    apps/activity/controllers/group.js 0 → 100644
    type: type || 2,
    navs: [{
    title: '进行中',
    src: '/activity/group/order?type=2&selectIndex=0'
    },
    {
    title: '全部',
    src: '/activity/group/order?type=1&selectIndex=1'
    }
    ],
    selectIndex: Number(selectIndex) || 0
    });
    }).catch(next);
    }
    function loadOrder(req, res, next) {
    • 陈峰
      @chenfeng163 commented 2019-03-13 03:40:15 UTC

      没有catch错误:catch(next)

    • 李奇
      @yoholq commented 2019-03-13 05:54:44 UTC

      已经修正

  • QC-L
    @QC-L 2019-03-13 05:53:55 UTC

    Added 2 commits:

    • 5b628fad - 添加遗漏的 next
    • 56c92330 - Merge branch 'feature/group-buy' of git.yoho.cn:fe/yohobuywap-node into feature/group-buy
  • 陈峰
    @chenfeng163 2019-03-13 05:59:03 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2019-03-13 05:59:04 UTC

    mentioned in commit 75a31cbe

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

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.