• 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 !356 opened 2017-03-10 04:37:36 UTC by李靖@lijing_yoho

Hotfix/uid raffle

Edited 2017-03-10 05:46:25 UTC
Request to merge hotfix/uidRaffle into gray
×

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/uidRaffle origin/hotfix/uidRaffle

Step 2. Review the changes locally

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

git checkout gray
git merge --no-ff hotfix/uidRaffle

Step 4. Push the result of the merge to GitLab

git push origin gray

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-03-10 05:46:25 UTC

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

  • Discussion 2
  • Commits 4
  • Changes 2
  • Avatar
    毕凯
    @bikai started a discussion on an outdated diff 2017-03-10 04:38:42 UTC
    Toggle discussion
    apps/activity/models/raffle.js
    };
     
    const _user = (params) => {
    if (!params.uid) {
    return {};
    • 毕凯
      @bikai commented 2017-03-10 04:38:42 UTC

      看下是否需要 Promise ?

  • Avatar
    毕凯
    @bikai started a discussion on the diff 2017-03-10 04:38:51 UTC
    Toggle discussion
    apps/activity/models/raffle.js
    const getOrders = (params) => {
    let finalResult = [];
     
    if (!params.uid) {
    • 毕凯
      @bikai commented 2017-03-10 04:38:51 UTC

      写法累赘

  • 李靖
    @lijing_yoho 2017-03-10 04:44:39 UTC

    Added 1 commit:

    • 8ba22b48 - 简写返回promise对象
  • 李靖
    @lijing_yoho 2017-03-10 05:40:33 UTC

    Added 1 commit:

    • 6426b44a - 返回promise空对象
  • 毕凯
    @bikai 2017-03-10 05:46:25 UTC

    mentioned in commit 4b69dda4

  • 毕凯
    @bikai 2017-03-10 05:46:25 UTC

    Status changed to merged

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

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.