• This project
    • Loading...
  • Sign in

fe / yohobuy-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 1
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Closed
Merge Request !31 opened 2016-12-22 12:56:11 UTC by李奇@yoholq

Feature/customer service

浏览器user-agent判断添加

Edited 2016-12-22 13:01:16 UTC
Request to merge feature/customerService into release/customer-service2
×

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/customerService origin/feature/customerService

Step 2. Review the changes locally

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

git checkout release/customer-service2
git merge --no-ff feature/customerService

Step 4. Push the result of the merge to GitLab

git push origin release/customer-service2

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Closed by 徐炜 2016-12-22 13:01:16 UTC

The changes were not merged into release/customer-service2.

  • Discussion 1
  • Commits 5
  • Changes 9
  • 李奇
    @yoholq 2016-12-22 12:56:47 UTC

    Reassigned to @aiden

  • 李奇
    @yoholq 2016-12-22 12:58:03 UTC

    Target branch changed from master to release/customer-service2

  • 4398428ec5c95d87ac838f6bf12315c7?s=80&d=identicon
    徐炜
    @aiden started a discussion on the diff 2016-12-22 12:59:11 UTC
    Toggle discussion
    apps/service/controllers/client.js
    layout: false
    };
     
    clientService.getClientData(type, encryptedUid, imgSize)
    .then(result => {
    res.render('client', Object.assign(data, result));
    if(unSupport) {
    res.render('unsupport', {
    layout: false
    });
    } else {
    clientService.getClientData(type, encryptedUid, imgSize)
    .then(result => {
    res.render('client', Object.assign(data, result));
    });
    • 徐炜
      @aiden commented 2016-12-22 12:59:11 UTC

      .catch(next);

  • 徐炜
    @aiden 2016-12-22 13:01:16 UTC

    Status changed to closed

  • Please register or login to post a comment
31 of 445
Prev Next
徐炜
Assignee
徐炜 @aiden
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuy-node!31