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

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

created top page

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b toppage origin/toppage

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 toppage

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 4
  • Commits 7
  • Pipelines 7
  • Changes 33
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 361e6dfa - fix toppage

    Compare with previous version

    Jul 31, 2020

    added 1 commit

    • 361e6dfa - fix toppage

    Compare with previous version

    added 1 commit * 361e6dfa - fix toppage [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4896&start_sha=eaf60d999bf3e60e49d159342f1d80836d758a02)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 613b69e5 - edit gitignore

    Compare with previous version

    Jul 31, 2020

    added 1 commit

    • 613b69e5 - edit gitignore

    Compare with previous version

    added 1 commit * 613b69e5 - edit gitignore [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4898&start_sha=361e6dfaee5cb37d549da160a6ed3de453e4a316)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 67a53af5 - add banner

    Compare with previous version

    Jul 31, 2020

    added 1 commit

    • 67a53af5 - add banner

    Compare with previous version

    added 1 commit * 67a53af5 - add banner [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4899&start_sha=613b69e5eafb8658b1e5963dd23e641421c67105)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 5bc09eea - fix index top page

    Compare with previous version

    Aug 03, 2020

    added 1 commit

    • 5bc09eea - fix index top page

    Compare with previous version

    added 1 commit * 5bc09eea - fix index top page [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4905&start_sha=67a53af50abbe3b0d9206c9118ca5cfc21866742)
    Toggle commit list
  • Ngô Trung Hưng @hungnt

    added 1 commit

    • 4b00c948 - use scope top hot

    Compare with previous version

    Aug 03, 2020

    added 1 commit

    • 4b00c948 - use scope top hot

    Compare with previous version

    added 1 commit * 4b00c948 - use scope top hot [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4910&start_sha=5bc09eeab5779a9558a01c99c043e44fadaef489)
    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/home/index.html.erb 0 → 100644
    1 <% provide(:title ,'Trang chủ') %>
    2 <%= render 'home/banner_and_search' %>
    3 <div class="padding_index"></div>
    4 <div class="box_text_five_jobs">
    5 <span>Năm công việc mới nhất dành cho bạn</span>
    • Hoang Phuc Do @phucdh commented Aug 03, 2020
      Master

      Nếu chưa có job thì cũng hiện dòng này.

      Cần phải kiểm tra điều kiện hiển thị ở đây

      Nếu chưa có job thì cũng hiện dòng này. Cần phải kiểm tra điều kiện hiển thị ở đây
    • Ngô Trung Hưng @hungnt

      changed this line in version 7 of the diff

      Aug 03, 2020

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4916&start_sha=4b00c9484f84b60ec64d8cf992e7b4723c0d2535#3bf63da9a86734af839552d26556a28fb7456f0c_5_4)
      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/layouts/_header.html.erb 0 → 100644
    1 <header class="cus_header">
    2 <div class="header_top">
    3 <div class="header_top_logo">
    4 <%= link_to image_tag("logo.png", alt: "logo", class: "logo_header"), '/' %>
    • Hoang Phuc Do @phucdh commented Aug 03, 2020
      Master

      Vì sao ở đây dùng dấu nháy kép ", các đoạn sử dụng link_to khác đều dùng dấu nháy đơn '

      Vì sao ở đây dùng dấu nháy kép `"`, các đoạn sử dụng `link_to` khác đều dùng dấu nháy đơn `'`
    • Ngô Trung Hưng @hungnt

      changed this line in version 7 of the diff

      Aug 03, 2020

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4916&start_sha=4b00c9484f84b60ec64d8cf992e7b4723c0d2535#12e0ffa73350b6f8b572afab727eeab71ee1df63_4_4)
      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/home/_box_nine_industries.html.erb 0 → 100644
    1 <div class="container">
    2 <div class="border_box_cities">
    3 <div class="box_text_five_jobs box_padding_city">
    4 <span>Top các nghành phổ biến</span>
    5 </div>
    6 <div class="row no-gutters">
    7 <% @top_industries.each do |industry| %>
    8 <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">
    9 <div class="box_info_city">
    10 <div class="ct_name">
    11 <%= link_to industry.name, '#',class: 'link_ct'%>
    12 </div>
    13 <div class="ct_jobs_count">
    14 <%= link_to "#{industry.jobs.count} công việc", '#',class: 'link_ct'%>
    • Hoang Phuc Do @phucdh commented Aug 03, 2020
      Master
      <%= link_to "#{industry.jobs.count} công việc", '#', class: 'link_ct'%>

      Sau dấu , phải có khoảng trắng.

      Kiểm tra và sửa lại các dòng khác nếu gặp trường hợp tương tự

      Edited Aug 03, 2020 by Hoang Phuc Do
      ```ruby <%= link_to "#{industry.jobs.count} công việc", '#', class: 'link_ct'%> ``` Sau dấu `,` phải có khoảng trắng. Kiểm tra và sửa lại các dòng khác nếu gặp trường hợp tương tự
    • Ngô Trung Hưng @hungnt commented Aug 03, 2020
      Master

      dạ anh

      dạ anh
    • Ngô Trung Hưng @hungnt

      changed this line in version 7 of the diff

      Aug 03, 2020

      changed this line in version 7 of the diff

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

    added 1 commit

    • c4382f23 - fix top page

    Compare with previous version

    Aug 03, 2020

    added 1 commit

    • c4382f23 - fix top page

    Compare with previous version

    added 1 commit * c4382f23 - fix top page [Compare with previous version](https://gitlab.zigexn.vn/hungnt/venjob_nth/merge_requests/4/diffs?diff_id=4916&start_sha=4b00c9484f84b60ec64d8cf992e7b4723c0d2535)
    Toggle commit list
  • Hoang Phuc Do @phucdh

    mentioned in commit 2e9845a6

    Aug 03, 2020

    mentioned in commit 2e9845a6

    mentioned in commit 2e9845a6f2a70bddc0519aaaefdc9fa69517d5e9
    Toggle commit list
  • Hoang Phuc Do @phucdh

    merged

    Aug 03, 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!4
×

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.