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

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

ID20 - Job detail

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b id20-job-detail origin/id20-job-detail

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 id20-job-detail

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 6
  • Commits 7
  • Pipelines 6
  • Changes 15
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Last updated by Tô Ngọc Ánh Aug 06, 2020
    app/views/jobs/show.html.erb 0 → 100644
    1 <nav aria-label='breadcrumb'>
    2 <ol class='breadcrumb'>
    3 <li class='breadcrumb-item'><%= link_to 'TOP', root_path %></li>
    4 <li class='breadcrumb-item'><%= link_to @job.locations.first.city, root_path %></li>
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Cái này sao link về root em?

      @anhtn Cái này sao link về `root` em?
    • Tô Ngọc Ánh @anhtn commented Aug 06, 2020
      Master

      tại chưa merge phần job list vô nên chưa có url, nên em để tạm root á a

      tại chưa merge phần job list vô nên chưa có url, nên em để tạm root á a
    • Tô Ngọc Ánh @anhtn

      changed this line in version 5 of the diff

      Aug 06, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4965&start_sha=d17806cb313aa0ee86e38b38a2f542fcc41ee7e1#ca1dced2048c1aa2fb1f535b6ec69018f9a4ba2a_4_4)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Last updated by Tô Ngọc Ánh Aug 06, 2020
    app/controllers/jobs_controller.rb 0 → 100644
    1 class JobsController < ApplicationController
    2 def show
    3 @job = Job.find(params[:id])
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Trường hợp không tìm thấy id bị exception nha em.

      @anhtn Trường hợp không tìm thấy `id` bị exception nha em.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Aug 06, 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/10/diffs?diff_id=4962&start_sha=cbf02c3128ec751a49720ef9d916fa7ad7970669#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 06, 2020
    Last updated by Tô Ngọc Ánh Aug 06, 2020
    app/views/jobs/show.html.erb 0 → 100644
    7 </ol>
    8 </nav>
    9 <div class="row">
    10 <div class="col-10">
    11 <h2 class="font-weight-bold"><%= @job.title %></h2>
    12 <h3><%= @job.company.name %></h3>
    13 <h5><strong>Work places: </strong>
    14 <i><%= @job.locations.map(&:city).join(' | ') %></i>
    15 </h5>
    16 <h5><strong>Industries: </strong>
    17 <i><%= @job.industries.map(&:name).join(' | ') %></i>
    18 </h5>
    19 <h5><strong>Salary: </strong><%= @job.salary %></h5>
    20 <hr>
    21 <h3><strong>Description:</strong></h3>
    22 <%= @job.description.html_safe %>
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Front-end trang detail có vẻ không đẹp lắm em!

      @anhtn Front-end trang detail có vẻ không đẹp lắm em!
    • Tô Ngọc Ánh @anhtn commented Aug 06, 2020
      Master

      làm đẹp nữa hả a, để e suy nghĩ thêm

      làm đẹp nữa hả a, để e suy nghĩ thêm
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 06, 2020
    Last updated by Tô Ngọc Ánh Aug 06, 2020
    config/routes.rb
    2 2 root to: 'home#index'
    3 3 get 'cities', to: 'locations#index'
    4 4 get 'industries', to: 'industries#index'
    5 resources :jobs, only: :show
    • Thanh Hung Pham @hungpt commented Aug 06, 2020
      Master

      @anhtn Yế cầu url format là /detail/[job id] nha em.

      @anhtn Yế cầu url format là `/detail/[job id]` nha em.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Aug 06, 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/10/diffs?diff_id=4962&start_sha=cbf02c3128ec751a49720ef9d916fa7ad7970669#e801163eb9182955dca3eb9817d59af634f6665d_5_5)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 6f1dba8a - Add fontawesome, edit route job, show page

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • 6f1dba8a - Add fontawesome, edit route job, show page

    Compare with previous version

    added 1 commit * 6f1dba8a - Add fontawesome, edit route job, show page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4962&start_sha=cbf02c3128ec751a49720ef9d916fa7ad7970669)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • d17806cb - edit fe show page

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • d17806cb - edit fe show page

    Compare with previous version

    added 1 commit * d17806cb - edit fe show page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4963&start_sha=6f1dba8a7b47aa7c2a29235be0a9d64ec30a832d)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 10 commits

    • d17806cb...9e711633 - 8 commits from branch master
    • d570f109 - resolve conflict
    • e1c9cc35 - edit fe show page

    Compare with previous version

    Aug 06, 2020

    added 10 commits

    • d17806cb...9e711633 - 8 commits from branch master
    • d570f109 - resolve conflict
    • e1c9cc35 - edit fe show page

    Compare with previous version

    added 10 commits * d17806cb...9e711633 - 8 commits from branch `master` * d570f109 - resolve conflict * e1c9cc35 - edit fe show page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4965&start_sha=d17806cb313aa0ee86e38b38a2f542fcc41ee7e1)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • d06a8465 - Add slug for company

    Compare with previous version

    Aug 06, 2020

    added 1 commit

    • d06a8465 - Add slug for company

    Compare with previous version

    added 1 commit * d06a8465 - Add slug for company [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4967&start_sha=e1c9cc353b659188beb2710011b81916c87a4c63)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • b1b847f2 - fix syntax rubocop

    Compare with previous version

    Aug 07, 2020

    added 1 commit

    • b1b847f2 - fix syntax rubocop

    Compare with previous version

    added 1 commit * b1b847f2 - fix syntax rubocop [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/10/diffs?diff_id=4968&start_sha=d06a846587b208d3a8ceb23584d3e59fc6fe4465)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    mentioned in commit 2f6f57b8

    Aug 07, 2020

    mentioned in commit 2f6f57b8

    mentioned in commit 2f6f57b83cc6c66184ee112aa206d8adac7a799e
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    merged

    Aug 07, 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!10
×

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.