• 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 !265 opened 2017-02-20 02:56:55 UTC by郭成尧@chengyao

结算部分日志添加

Edited 2017-02-20 02:58:55 UTC
Request to merge feature/cart into release/5.4.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 feature/cart origin/feature/cart

Step 2. Review the changes locally

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

git checkout release/5.4.1
git merge --no-ff feature/cart

Step 4. Push the result of the merge to GitLab

git push origin release/5.4.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 陈峰 2017-02-20 02:57:17 UTC

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

  • Discussion 1
  • Commits 10
  • Changes 13
  • 陈峰
    @chenfeng163 2017-02-20 02:57:17 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2017-02-20 02:57:17 UTC

    mentioned in commit e8a80af4

  • Avatar
    毕凯
    @bikai started a discussion on the diff 2017-02-20 02:58:55 UTC
    Toggle discussion
    apps/cart/controllers/order.js
    try {
    orderInfo = JSON.parse(req.cookies['order-info']);
    } catch (e) {
    logger.info(`orderEnsure: get orderInfo from cookie error:${JSON.stringify(e)}`);
    • 毕凯
      @bikai commented 2017-02-20 02:58:55 UTC

      此处使用 logger.error

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

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.