Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venshop
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Nguyen Quoc Kien
  • venshop
  • Merge Requests
  • !3

Merged
Opened Jul 31, 2015 by Nguyen Quoc Kien@kiennq 
  • Report abuse
Report abuse

Fix review code

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b fix_review_code origin/fix_review_code

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff fix_review_code

Step 4. Push the result of the merge to GitLab

git push origin develop

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

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

  • Discussion 1
  • Commits 21
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Quoc Kien @kiennq

    Reassigned to @lannn

    Jul 31, 2015

    Reassigned to @lannn

    Reassigned to @lannn
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 882dbee9 - Edit: OrderNotifier - Content
    Jul 31, 2015

    Added 1 commit:

    • 882dbee9 - Edit: OrderNotifier - Content
    Added 1 commit: * 882dbee9 - Edit: OrderNotifier - Content
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 4c67bd5c - Fix: search product
    Jul 31, 2015

    Added 1 commit:

    • 4c67bd5c - Fix: search product
    Added 1 commit: * 4c67bd5c - Fix: search product
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • d895a13f - Modify code carts
    Aug 03, 2015

    Added 1 commit:

    • d895a13f - Modify code carts
    Added 1 commit: * d895a13f - Modify code carts
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 79799b81 - Fix code admin: add products
    Aug 03, 2015

    Added 1 commit:

    • 79799b81 - Fix code admin: add products
    Added 1 commit: * 79799b81 - Fix code admin: add products
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 3ab34a38 - Fix format html
    Aug 03, 2015

    Added 1 commit:

    • 3ab34a38 - Fix format html
    Added 1 commit: * 3ab34a38 - Fix format html
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 480cc163 - Fix format html #2
    Aug 03, 2015

    Added 1 commit:

    • 480cc163 - Fix format html #2
    Added 1 commit: * 480cc163 - Fix format html #2
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 3 commits:

    • d1533c09 - make it better
    • 37430b6e - make it better2
    • bd0447a0 - Fix bug
    Aug 03, 2015

    Added 3 commits:

    • d1533c09 - make it better
    • 37430b6e - make it better2
    • bd0447a0 - Fix bug
    Added 3 commits: * d1533c09 - make it better * 37430b6e - make it better2 * bd0447a0 - Fix bug
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 777c305a - Fix bugs: Phan trang, show errors, SQL Injection, review code...
    Aug 04, 2015

    Added 1 commit:

    • 777c305a - Fix bugs: Phan trang, show errors, SQL Injection, review code...
    Added 1 commit: * 777c305a - Fix bugs: Phan trang, show errors, SQL Injection, review code...
    Toggle commit list
  • Nguyen Ngoc Lan
    @lannn started a discussion on an old version of the diff Aug 04, 2015
    app/controllers/cart_products_controller.rb
    46 if (i == 0)
    47 session[@user_id][product_id] = number
    48 end
    49 end
    50
    51 def update_product_to_cart(product_id, number)
    52 session[@user_id].each do |key, value|
    53 if (key == product_id.to_s)
    54 session[@user_id][key] = number
    55 break
    56 end
    57 end
    58 end
    59
    60 def check_quantity?
    61 if params[:quantity].to_i > 0
    • Nguyen Ngoc Lan @lannn commented Aug 04, 2015
      Developer

      @kiennq this logic can be simple by using one-line condition

      params[:quantity].to_i > 0 ? true : false
      @kiennq this logic can be simple by using one-line condition ```ruby params[:quantity].to_i > 0 ? true : false ```
    Please register or sign in to reply
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 5fca702f - Fix: pull request #1..check_quantity?
    Aug 05, 2015

    Added 1 commit:

    • 5fca702f - Fix: pull request #1..check_quantity?
    Added 1 commit: * 5fca702f - Fix: pull request #1..check_quantity?
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 6e7cea70 - Review code: Move find_product() to application_controller
    Aug 05, 2015

    Added 1 commit:

    • 6e7cea70 - Review code: Move find_product() to application_controller
    Added 1 commit: * 6e7cea70 - Review code: Move find_product() to application_controller
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • a163d341 - Fixed find_product #2
    Aug 05, 2015

    Added 1 commit:

    • a163d341 - Fixed find_product #2
    Added 1 commit: * a163d341 - Fixed find_product #2
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • 1d262038 - Fixed find_category #1
    Aug 05, 2015

    Added 1 commit:

    • 1d262038 - Fixed find_category #1
    Added 1 commit: * 1d262038 - Fixed find_category #1
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Added 1 commit:

    • a8fbe918 - Finish review code
    Aug 07, 2015

    Added 1 commit:

    • a8fbe918 - Finish review code
    Added 1 commit: * a8fbe918 - Finish review code
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    mentioned in commit b9cc116f

    Aug 07, 2015

    mentioned in commit b9cc116f

    mentioned in commit b9cc116f6f13c1c2d9c1b5fd205426ae4d291381
    Toggle commit list
  • Nguyen Quoc Kien @kiennq

    Status changed to merged

    Aug 07, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Nguyen Ngoc Lan
Assignee
Nguyen Ngoc Lan @lannn
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: kiennq/venshop!3