Feature/job detail
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-
-
-
-
-
-
-
-
resolved all discussions
Toggle commit list -
Toggle commit list
-
merged
Toggle commit list
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.
| 59 | 51 | line-height: 1.7em; |
| 60 | 52 | } |
| 61 | 53 | |
| 54 | .container.text-center { | |
| 55 | margin-bottom: 30px; | |
Please
register
or
sign in
to reply
|
||
| 1 | 1 | class JobsController < ApplicationController |
| 2 | 2 | def index |
| 3 | @jobs = Job.page(params[:page]).per(Settings.job.per_page) | |
| 3 | if params[:city_id] | |
|
||
| 157 | 154 | list-style-type: none; |
| 158 | 155 | line-height: normal; |
| 159 | 156 | } |
| 157 | ||
| 158 | .breadcrump { | |
|
||
| 1 | 1 | class JobsController < ApplicationController |
| 2 | 2 | def index |
| 3 | @jobs = Job.page(params[:page]).per(Settings.job.per_page) | |
| 3 | if params[:city_id] | |
| 4 | redirect_to jobs_path if params[:city_id].blank? | |
| 5 | @city = City.find(params[:city_id]) | |
| 6 | @jobs = @city.jobs | |
| 7 | elsif params[:industry_id] | |
| 8 | redirect_to jobs_path if params[:industry_id].blank? | |
|
||
| 2 | 2 | <div class="job_data"> |
| 3 | 3 | <dl class="job_data_row"> |
| 4 | 4 | <dt>Title</dt> |
| 5 | <dd><%= latest_job.title %></dd> | |
| 5 | <dd><%= link_to latest_job.title, job_path(latest_job.id) %></dd> | |
| 6 | 6 | </dl> |
| 7 | 7 | <dl class="job_data_row"> |
| 8 | 8 | <dt>Short description</dt> |
| 9 | <dd><%= truncate(latest_job.short_des, length: 250) %></dd> | |
| 9 | <dd><%= latest_job.decorate.display_short_des %></dd> | |
|
||
| 1 | <h3>Total: <%= Job.count %></h3> | |
| 1 | <h3>Total: <%= params[:city_id] ? @city.jobs.count : | |
|
||
added 1 commit
resolved all discussions
resolved all discussions
added 1 commit
mentioned in commit 039891b2
mentioned in commit 039891b2
merged
merged