Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VietTH-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 4
    • Merge Requests 4
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Tran Hoang Viet
  • VietTH-VenShop
  • Merge Requests
  • !14

Open
Opened Jul 22, 2015 by Tran Hoang Viet@vietth 
  • Report abuse
Report abuse

VietTH: Feature login social facebook, twitter, google plus

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b vietth_feat_social_login origin/vietth_feat_social_login

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 vietth_feat_social_login

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 4
  • Commits 14
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Truong Ba Dieu
    @dieutb started a discussion on the diff Jul 28, 2015
    Last updated by Tran Hoang Viet Jul 29, 2015
    app/controllers/orders_controller.rb
    1 1 class OrdersController < ApplicationController
    2 2 before_action :authenticate_user!
    3 before_action :set_order, only: [:show, :update]
    4 before_action -> { authorize(@order) }, only: [:show, :update]
    • Truong Ba Dieu @dieutb commented Jul 28, 2015
      Developer

      action update ko dung nua

      action update ko dung nua
    • Tran Hoang Viet @vietth commented Jul 29, 2015
      Master

      Fixed

      Fixed
    Please register or sign in to reply
  • Truong Ba Dieu
    @dieutb started a discussion on the diff Jul 28, 2015
    Last updated by Tran Hoang Viet Jul 29, 2015
    app/controllers/products_controller.rb
    32 32 end
    33 33 end
    34 34  
    35 def search
    36 query = params[:query].present? ? {title: params[:query]} : '*'
    37 @products = Product.search(query, page: params[:page])
    38 add_breadcrumb('Search result')
    39 end
    40
    41 35 def meta_attributes
    42 36 return if @product.blank?
    43 37  
    44 38 @meta_attributes ||= {
    • Truong Ba Dieu @dieutb commented Jul 28, 2015
      Developer

      nen tao 1 helper de co the dung lai, share tren social co nhung tieu chuan ve limit text cho title, desc, va kich thuoc cua image.

      nen tao 1 helper de co the dung lai, share tren social co nhung tieu chuan ve limit text cho title, desc, va kich thuoc cua image.
    • Tran Hoang Viet @vietth commented Jul 29, 2015
      Master

      helper dung cho view thi gem meta-tags da lam roi. code tren chi khai bao gia tri meta va application controller chiu trach nhiem set gia tri nay cho meta-tags

      helper dung cho view thi gem meta-tags da lam roi. code tren chi khai bao gia tri meta va application controller chiu trach nhiem set gia tri nay cho meta-tags
    Please register or sign in to reply
  • 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
3
3 participants
Reference: vietth/VietTH-VenShop!14