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
  • Đường Sỹ Hoàng
  • VenJob
  • Merge Requests
  • !10

Merged
Opened Jan 08, 2020 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

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 feature/job_detail origin/feature/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 feature/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 2
  • Changes 12
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 08, 2020
    Last updated by Đường Sỹ Hoàng Jan 08, 2020
    app/views/jobs/show.html.erb 0 → 100644
    23
    24 <!--Display detail of jobs-->
    25 <div class="row row-cols-1">
    26 <div class="job-content-wrapper">
    27 <dl class="row">
    28 <dt class="col-sm-3">Job Title:</dt>
    29 <dd class="col-sm-9"><%= @job.title %></dd>
    30
    31 <dt class="col-sm-3">Position:</dt>
    32 <dd class="col-sm-9">
    33 <%= @job.position%>
    34 </dd>
    35
    36 <dt class="col-sm-3">City:</dt>
    37 <dd class="col-sm-9">
    38 <% @job.cities.map(&:name).each do |city_name| %>
    • Son Do Hong @sondh commented Jan 08, 2020
      Master
      <% @job.cities.each do |city| %>
        <%= link_to city.name, city_jobs_path(city) %>
      <% end %>
      ```ruby <% @job.cities.each do |city| %> <%= link_to city.name, city_jobs_path(city) %> <% end %> ```
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Jan 08, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/10/diffs?diff_id=4639&start_sha=11efa041733a0c87e607ba5e47e68fd348cfccab#ca1dced2048c1aa2fb1f535b6ec69018f9a4ba2a_38_31)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 08, 2020
    Last updated by Đường Sỹ Hoàng Jan 08, 2020
    app/views/jobs/show.html.erb 0 → 100644
    18 <%= link_to "Industry", industries_path %>
    19 </li>
    20 <li class="breadcrumb-item active" aria-current="page">Current Job</li>
    21 </ol>
    22 </nav>
    23
    24 <!--Display detail of jobs-->
    25 <div class="row row-cols-1">
    26 <div class="job-content-wrapper">
    27 <dl class="row">
    28 <dt class="col-sm-3">Job Title:</dt>
    29 <dd class="col-sm-9"><%= @job.title %></dd>
    30
    31 <dt class="col-sm-3">Position:</dt>
    32 <dd class="col-sm-9">
    33 <%= @job.position%>
    • Son Do Hong @sondh commented Jan 08, 2020
      Master

      thiếu space

      thiếu space
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Jan 08, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/10/diffs?diff_id=4639&start_sha=11efa041733a0c87e607ba5e47e68fd348cfccab#ca1dced2048c1aa2fb1f535b6ec69018f9a4ba2a_33_26)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • adcb38b3 - Deleted header files, fixed space

    Compare with previous version

    Jan 08, 2020

    added 1 commit

    • adcb38b3 - Deleted header files, fixed space

    Compare with previous version

    added 1 commit * adcb38b3 - Deleted header files, fixed space [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/10/diffs?diff_id=4639&start_sha=11efa041733a0c87e607ba5e47e68fd348cfccab)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on the diff Jan 08, 2020
    Last updated by Đường Sỹ Hoàng Jan 08, 2020
    config/routes.rb
    20 20
    21 21 get "jobs/city/:city_id", to: "jobs#index", as: "city_jobs"
    22 22 get "jobs/industry/:industry_id", to: "jobs#index", as: "industry_jobs"
    23 get "detail/:job_id", to: "jobs#show", as: "job"
    23 24
    24 25 concern :paginatable do
    25 26 get "(page/:page)", action: :index, on: :collection, as: ""
    26 27 end
    27 28
    28 resources :jobs, only: :index, concerns: :paginatable
    • Son Do Hong @sondh commented Jan 08, 2020
      Master

      xóa vậy xong có còn vào đc trang /jobs không

      xóa vậy xong có còn vào đc trang /jobs không
    • Đường Sỹ Hoàng @hoangds commented Jan 08, 2020
      Master

      Xoá đi thì vẫn còn vào được trang /jobs

      Xoá đi thì vẫn còn vào được trang /jobs
    • Son Do Hong @sondh commented Jan 08, 2020
      Master

      @hoangds em định nghĩa routes /jobs ở đâu để có thể truy cập được

      @hoangds em định nghĩa routes /jobs ở đâu để có thể truy cập được
    • Đường Sỹ Hoàng @hoangds commented Jan 08, 2020
      Master

      @sondh Em định nghĩa ở dòng resource :jobsđể truy cập vào trnag /jobs

      @sondh Em định nghĩa ở dòng `resource :jobs`để truy cập vào trnag /jobs
    Please register or sign in to reply
  • Son Do Hong @sondh

    mentioned in commit 476404b3

    Jan 08, 2020

    mentioned in commit 476404b3

    mentioned in commit 476404b330a03f9348f5b46aa6417b2d15c6a9d7
    Toggle commit list
  • Son Do Hong @sondh

    merged

    Jan 08, 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
Son Do Hong
Assignee
Son Do Hong @sondh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/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.