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 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Truong Ba Dieu
  • VenShop
  • Merge Requests
  • !4

Closed
Opened Jul 22, 2015 by Truong Ba Dieu@dieutb 
  • Report abuse
Report abuse

Feature Optional

×

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

Step 2. Review the changes locally

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

git checkout feature-test
git merge --no-ff feature-optional

Step 4. Push the result of the merge to GitLab

git push origin feature-test

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

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

  • Discussion 5
  • Commits 9
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 63e2710e - Config for production
    Jul 22, 2015

    Added 1 commit:

    • 63e2710e - Config for production
    Added 1 commit: * 63e2710e - Config for production
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 265d4a89 - Add available for product
    Jul 23, 2015

    Added 1 commit:

    • 265d4a89 - Add available for product
    Added 1 commit: * 265d4a89 - Add available for product
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 6a0dc392 - Fix layout devise
    Jul 23, 2015

    Added 1 commit:

    • 6a0dc392 - Fix layout devise
    Added 1 commit: * 6a0dc392 - Fix layout devise
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 1979f8b2 - Fix solr search special char
    Jul 23, 2015

    Added 1 commit:

    • 1979f8b2 - Fix solr search special char
    Added 1 commit: * 1979f8b2 - Fix solr search special char
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 8cb0cc71 - Add seed admin
    Jul 23, 2015

    Added 1 commit:

    • 8cb0cc71 - Add seed admin
    Added 1 commit: * 8cb0cc71 - Add seed admin
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 93747a6e - Add meta for share
    Jul 23, 2015

    Added 1 commit:

    • 93747a6e - Add meta for share
    Added 1 commit: * 93747a6e - Add meta for share
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 181deb8b - Fix search solr with special char
    Jul 23, 2015

    Added 1 commit:

    • 181deb8b - Fix search solr with special char
    Added 1 commit: * 181deb8b - Fix search solr with special char
    Toggle commit list
  • Truong Ba Dieu @dieutb

    Added 1 commit:

    • 9a93a645 - Fix recalculate order
    Jul 23, 2015

    Added 1 commit:

    • 9a93a645 - Fix recalculate order
    Added 1 commit: * 9a93a645 - Fix recalculate order
    Toggle commit list
  • Tran Hoang Viet
    @vietth started a discussion on the diff Jul 28, 2015
    app/controllers/products_controller.rb
    9 11 @product = Product.find(params[:id])
    10 12 add_breadcrumb @product.category.try(:name), category_path(@product.category.try(:id))
    11 13 add_breadcrumb @product.title
    14
    15 fetch_social_info(@product.title, @product.title, @product.image.thumb("158x158#").url)
    16 render layout: "share_social"
    • Tran Hoang Viet @vietth commented Jul 28, 2015
      Reporter

      Có thể sử dụng gem meta-tags để quản render các metags. Layout application.html.slim và share_social.html.erb rất giống nhau. Mình có thể dung chung 1 layout ?

      Có thể sử dụng gem `meta-tags` để quản render các metags. Layout `application.html.slim` và `share_social.html.erb` rất giống nhau. Mình có thể dung chung 1 layout ?
    Please register or sign in to reply
  • Tran Hoang Viet
    @vietth started a discussion on the diff Jul 28, 2015
    app/decorators/order_decorator.rb 0 → 100644
    1 class OrderDecorator < Draper::Decorator
    2 include Draper::LazyHelpers
    3
    4 def pid_link
    5 unless !object.cart?
    • Tran Hoang Viet @vietth commented Jul 28, 2015
      Reporter

      Có thể viết lại if object.cart?

      Có thể viết lại `if object.cart?`
    Please register or sign in to reply
  • Tran Hoang Viet
    @vietth started a discussion on the diff Jul 29, 2015
    app/services/vacuum_aws_service.rb
    8 aws_access_key_id: ENV['aws_access_key_id'],
    9 aws_secret_access_key: ENV['aws_secret_access_key'],
    10 associate_tag: ENV['associate_tag']
    11 )
    12
    13 response = request.item_lookup(
    14 query: {
    15 'ItemId' => options[:item_id],
    16 'ResponseGroup' => 'Medium'
    17 }
    18 ).to_h
    19 if response["ItemLookupResponse"]["Items"]["Item"].present?
    20 VacuumAwsService.parse_item(response["ItemLookupResponse"]["Items"]["Item"])
    21 else
    22 nil
    23 end
    • Tran Hoang Viet @vietth commented Jul 29, 2015
      Reporter

      co the viet lai:

      if response["ItemLookupResponse"]["Items"]["Item"].present?
            VacuumAwsService.parse_item(response["ItemLookupResponse"]["Items"]["Item"])
      end

      khong can else nil end. Vi ruby return last line --> neu if response["ItemLookupResponse"]["Items"]["Item"].present? false thi se return nil

      co the viet lai: ```ruby if response["ItemLookupResponse"]["Items"]["Item"].present? VacuumAwsService.parse_item(response["ItemLookupResponse"]["Items"]["Item"]) end ``` khong can `else nil end`. Vi ruby return last line --> neu `if response["ItemLookupResponse"]["Items"]["Item"].present?` false thi se return nil
    Please register or sign in to reply
  • Tran Hoang Viet
    @vietth started a discussion on the diff Jul 29, 2015
    app/views/layouts/_navigation_links.html.slim
    1 1 - if policy(:product).new?
    2 li
    3 = link_to "New product", new_product_path
    2 li= link_to "New product", new_product_path
    4 3  
    4 - if current_user.present?
    5 li= link_to "My orders", orders_path
    • Tran Hoang Viet @vietth commented Jul 29, 2015
      Reporter

      hinh nhu li= link_to "My orders", orders_path thieu tab 2 space

      hinh nhu `li= link_to "My orders", orders_path` thieu tab 2 space
    Please register or sign in to reply
  • Tran Hoang Viet
    @vietth started a discussion on the diff Jul 29, 2015
    db/seeds.rb
    5 5 #
    6 6 # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
    7 7 # Mayor.create(name: 'Emanuel', city: cities.first)
    8
    9
    10 u = User.find_by(email: "admin@gmail.com")
    11 if u.blank?
    12 u = User.create(name: "admin", email: "admin@gmail.com", password: "abc123456")
    • Tran Hoang Viet @vietth commented Jul 29, 2015
      Reporter

      co the dung find_or_create_by

      co the dung `find_or_create_by`
    Please register or sign in to reply
  • Truong Ba Dieu @dieutb

    Status changed to closed

    Jul 31, 2015

    Status changed to closed

    Status changed to closed
    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
1
Labels
Review
Assign labels
  • View labels
3
3 participants
Reference: dieutb/VenShop!4