Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VeNJob
  • 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
  • Tô Ngọc Ánh
  • VeNJob
  • Merge Requests
  • !7

Merged
Opened Jul 30, 2020 by Tô Ngọc Ánh@anhtn 
  • Report abuse
Report abuse

show latest jobs, top industries, top cities

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b id1-top-page origin/id1-top-page

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 id1-top-page

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 7
  • Commits 5
  • Pipelines 4
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jul 30, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/controllers/home_controller.rb 0 → 100644
    1 class HomeController < ApplicationController
    2 def index
    3 @total_jobs = Job.count
    • Thanh Hung Pham @hungpt commented Jul 30, 2020
      Master

      @anhtn Em research giữa size, length, count Xem cái nào hợp lý hơn để dùng ở đây nha em.

      Edited Jul 31, 2020
      @anhtn Em research giữa `size`, `length`, `count` Xem cái nào hợp lý hơn để dùng ở đây nha em.
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 30, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/controllers/home_controller.rb 0 → 100644
    1 class HomeController < ApplicationController
    2 def index
    3 @total_jobs = Job.count
    4 @locations = Location.all
    5 @industries = Industry.all
    6 @jobs = Job.order(created_at: :desc).limit(6)
    • Thanh Hung Pham @hungpt commented Jul 30, 2020
      Master

      @anhtn Mấy số cố định nên để constant, và để trong Model tương ứng nha em

      Edited Jul 31, 2020
      @anhtn Mấy số cố định nên để constant, và để trong Model tương ứng nha em
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Jul 31, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4890&start_sha=6da4db83e61b505e534aeba32e8685c29a02be27#559869901c694d8d8f52f93007c8b250a14147f0_6_6)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 30, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/controllers/home_controller.rb 0 → 100644
    1 class HomeController < ApplicationController
    2 def index
    3 @total_jobs = Job.count
    4 @locations = Location.all
    5 @industries = Industry.all
    6 @jobs = Job.order(created_at: :desc).limit(6)
    7 @top_cities = list_top_of(@locations, 9)
    8 @top_industries = list_top_of(@industries, 9)
    9 end
    10
    11 private
    12
    13 def list_top_of(list_object, number)
    • Thanh Hung Pham @hungpt commented Jul 30, 2020
      Master

      @anhtn Em đang gặp issue ở đây nên anh chưa review nha.

      Edited Jul 31, 2020
      @anhtn Em đang gặp issue ở đây nên anh chưa review nha.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Jul 31, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4890&start_sha=6da4db83e61b505e534aeba32e8685c29a02be27#559869901c694d8d8f52f93007c8b250a14147f0_13_6)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 30, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/views/home/_city.html.erb 0 → 100644
    1 <% location = Location.find_by(id: object[0]) %>
    2 <div class="col-4 my-2">
    • Thanh Hung Pham @hungpt commented Jul 30, 2020
      Master

      @anhtn Thống nhất ' hay " nha em! Dùng 1 cái thôi. Apply cho hết file html.erb nha em

      Edited Jul 31, 2020 by Thanh Hung Pham
      @anhtn Thống nhất `'` hay `"` nha em! Dùng 1 cái thôi. Apply cho hết file `html.erb` nha em
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Jul 31, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4890&start_sha=6da4db83e61b505e534aeba32e8685c29a02be27#835e9ef5e149370abcf1f0750b44547287245360_2_1)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Jul 31, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 2 commits

    • e175a0c0 - Change double quotes to single quote
    • 03ee3000 - create scope select top locations, industries

    Compare with previous version

    Jul 31, 2020

    added 2 commits

    • e175a0c0 - Change double quotes to single quote
    • 03ee3000 - create scope select top locations, industries

    Compare with previous version

    added 2 commits * e175a0c0 - Change double quotes to single quote * 03ee3000 - create scope select top locations, industries [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4890&start_sha=6da4db83e61b505e534aeba32e8685c29a02be27)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jul 31, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/controllers/home_controller.rb 0 → 100644
    1 class HomeController < ApplicationController
    2 def index
    3 @total_jobs = Job.count
    4 @locations = Location.all
    5 @industries = Industry.all
    6 @jobs = Job.order(created_at: :desc).limit(Job::NUMBER_LATEST_JOB)
    7 @top_cities = Location.top_locations(9)
    • Thanh Hung Pham @hungpt commented Jul 31, 2020
      Master

      @anhtn Cái này để constang luôn nha em! Để trong Model tương ứng.

      Edited Jul 31, 2020
      @anhtn Cái này để constang luôn nha em! Để trong Model tương ứng.
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 31, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/views/shared/_navbar.html.erb 0 → 100644
    1 <nav class='navbar navbar-expand-lg navbar-light sticky-top'>
    • Thanh Hung Pham @hungpt commented Jul 31, 2020
      Master

      @anhtn Nên đổi tên file này thành _header.html.erb. Nó dễ hiểu hơn.

      Edited Jul 31, 2020
      @anhtn Nên đổi tên file này thành `_header.html.erb`. Nó dễ hiểu hơn.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 3 of the diff

      Jul 31, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4900&start_sha=03ee3000ec5a5d4aa59d16bd690551a8fc208eb6#8406464fc3a685c7b8b56b8812d374bc1a5b8093_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Jul 31, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 31, 2020
    Resolved by Tô Ngọc Ánh Jul 31, 2020
    app/views/home/index.html.erb 0 → 100644
    1 <div class='banner_top'>
    2 <%= image_tag 'venjob-banner',class: 'banner_img'%>
    3 <div class='overlay'></div>
    4 <div class='box_seach text-center'>
    5 <h3>We have <%= @total_jobs %> jobs for you</h3>
    6 <%= render 'shared/searchbar' %>
    7 </div>
    8 </div>
    9 <div id='latest-job' class='my-4 text-center'>
    10 <h1>Latest Job</h1>
    • Thanh Hung Pham @hungpt commented Jul 31, 2020
      Master

      @anhtn Chỗ này số nhiều nha em

      Edited Jul 31, 2020
      @anhtn Chỗ này số nhiều nha em
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Jul 31, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4901&start_sha=28ad2bf6171d268baf44dd16aaa6a95608bdc440#3bf63da9a86734af839552d26556a28fb7456f0c_10_9)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 28ad2bf6 - refactor code

    Compare with previous version

    Jul 31, 2020

    added 1 commit

    • 28ad2bf6 - refactor code

    Compare with previous version

    added 1 commit * 28ad2bf6 - refactor code [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4900&start_sha=03ee3000ec5a5d4aa59d16bd690551a8fc208eb6)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • c1dd47eb - add plural for noun

    Compare with previous version

    Jul 31, 2020

    added 1 commit

    • c1dd47eb - add plural for noun

    Compare with previous version

    added 1 commit * c1dd47eb - add plural for noun [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/7/diffs?diff_id=4901&start_sha=28ad2bf6171d268baf44dd16aaa6a95608bdc440)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Jul 31, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    mentioned in commit 4e70cfdf

    Jul 31, 2020

    mentioned in commit 4e70cfdf

    mentioned in commit 4e70cfdf6e05ba656a4ca0515103e4392fa110f8
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    merged

    Jul 31, 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: anhtn/VeNJob!7
×

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.