Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venjob_nth
  • 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 3
    • Merge Requests 3
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Ngô Trung Hưng
  • venjob_nth
  • Merge Requests
  • !5

Merged
Opened Aug 03, 2020 by Ngô Trung Hưng@hungnt 
  • Report abuse
Report abuse

create ID2

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b citylist origin/citylist

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff citylist

Step 4. Push the result of the merge to GitLab

git push origin master

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

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

  • Discussion 2
  • Commits 3
  • Pipelines 3
  • Changes 19
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ngô Trung Hưng @hungnt

    added 9 commits

    • eb37ee3e...2e9845a6 - 8 commits from branch master
    • 7dc4d2fa - create ID2 ID3

    Compare with previous version

    Aug 03, 2020

    added 9 commits

    • eb37ee3e...2e9845a6 - 8 commits from branch master
    • 7dc4d2fa - create ID2 ID3

    Compare with previous version

    added 9 commits * eb37ee3e...2e9845a6 - 8 commits from branch `master` * 7dc4d2fa - create ID2 ID3 [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/5/diffs?diff_id=4917&start_sha=eb37ee3e7ca65df9eb0037c7b308762e20365184)
    Toggle commit list
  • Hoang Phuc Do
    @phucdh started a discussion on an old version of the diff Aug 03, 2020
    Last updated by Ngô Trung Hưng Aug 03, 2020
    app/views/industry/index.html.erb 0 → 100644
    1 <% provide(:title, 'Top nghành') %>
    2 <%= render 'shared/scroll_top' %>
    3 <div class="container">
    4 <div class="row">
    5 <div class="col-lg-12">
    6 <div class="title_list_city title_list_city_vn">
    7 <span>Top nghành</span>
    8 </div>
    9 </div>
    10 <div class="container">
    11 <div class="row">
    12 <% @industries.each do |industry| %>
    • Hoang Phuc Do @phucdh commented Aug 03, 2020
      Master

      Sử dụng https://guides.rubyonrails.org/layouts_and_rendering.html#rendering-collections

      Sử dụng https://guides.rubyonrails.org/layouts_and_rendering.html#rendering-collections
    • Ngô Trung Hưng @hungnt

      changed this line in version 3 of the diff

      Aug 03, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/5/diffs?diff_id=4923&start_sha=7dc4d2fa7277d5b1529e4f5d6b0fd1698e437b0e#d33c2acd795c8d0bead5df16348ddb0c644cdf50_12_11)
      Toggle commit list
    Please register or sign in to reply
  • Hoang Phuc Do
    @phucdh started a discussion on an old version of the diff Aug 03, 2020
    Last updated by Ngô Trung Hưng Aug 03, 2020
    app/views/city/index.html.erb 0 → 100644
    20 <button class="btn_option_location btn_option_location-qt">Nước ngoài</button>
    21 </div>
    22 </div>
    23 </div>
    24 </div>
    25 <!-- Main -->
    26 <div class="container">
    27 <div class="row">
    28 <div class="col-lg-12">
    29 <div class="title_list_city title_list_city_vn">
    30 <span>Các tỉnh, thành phố thuôc Việt Nam</span>
    31 </div>
    32 </div>
    33 <div class="container">
    34 <div class="row">
    35 <% @list_cities_domestic.each do |city| %>
    • Hoang Phuc Do @phucdh commented Aug 03, 2020
      Master

      https://guides.rubyonrails.org/layouts_and_rendering.html#rendering-collections

      Tương tự với các trường hợp khác

      https://guides.rubyonrails.org/layouts_and_rendering.html#rendering-collections Tương tự với các trường hợp khác
    • Ngô Trung Hưng @hungnt

      changed this line in version 3 of the diff

      Aug 03, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/5/diffs?diff_id=4923&start_sha=7dc4d2fa7277d5b1529e4f5d6b0fd1698e437b0e#e010450e72815234eb4b15c7069cebe4981a2660_35_35)
      Toggle commit list
    Please register or sign in to reply
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 29876198 - use collection in render partial

    Compare with previous version

    Aug 03, 2020

    added 1 commit

    • 29876198 - use collection in render partial

    Compare with previous version

    added 1 commit * 29876198 - use collection in render partial [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/5/diffs?diff_id=4923&start_sha=7dc4d2fa7277d5b1529e4f5d6b0fd1698e437b0e)
    Toggle commit list
  • Hoang Phuc Do @phucdh

    mentioned in commit b73cf713

    Aug 04, 2020

    mentioned in commit b73cf713

    mentioned in commit b73cf713ffd351753b4b19137d91879f9650f318
    Toggle commit list
  • Hoang Phuc Do @phucdh

    merged

    Aug 04, 2020

    merged

    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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hungnt/venjob_nth!5
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.