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
  • !13

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

VietTH: Feature additional

×

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_additional origin/vietth_feat_additional

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_additional

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 0
  • Commits 14
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tran Hoang Viet @vietth

    Added 3 commits:

    • e6026430 - VietTH: Use gem pundit instead cancan
    • bae6f988 - VietTH: Fix review code, saperate admin orders controler
    • 857001a1 - Merge branch 'vietth_feat_order_management' into vietth_feat_additional
    Jul 22, 2015

    Added 3 commits:

    • e6026430 - VietTH: Use gem pundit instead cancan
    • bae6f988 - VietTH: Fix review code, saperate admin orders controler
    • 857001a1 - Merge branch 'vietth_feat_order_management' into vietth_feat_additional
    Added 3 commits: * e6026430 - VietTH: Use gem pundit instead cancan * bae6f988 - VietTH: Fix review code, saperate admin orders controler * 857001a1 - Merge branch 'vietth_feat_order_management' into vietth_feat_additional
    Toggle commit list
  • Tran Hoang Viet @vietth

    Added 1 commit:

    • 858c8851 - VietTH: Allow search with multi category
    Jul 23, 2015

    Added 1 commit:

    • 858c8851 - VietTH: Allow search with multi category
    Added 1 commit: * 858c8851 - VietTH: Allow search with multi category
    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: vietth/VietTH-VenShop!13