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 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Nguyen Ngoc Nghia
  • VeNJOB
  • Merge Requests
  • !14

Merged
Opened Dec 18, 2019 by Nguyen Ngoc Nghia@nghiann 
  • Report abuse
Report abuse

Feature/industry page

  • Display all industries in database with job count based on each industries.
  • Display top 9 industries on top page, order by job count.
  • Not link to job list yet. industry_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 feature/industry_page origin/feature/industry_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 feature/industry_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 1
  • Commits 7
  • Changes 13
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • dd160e6f - delete unused file

    Compare with previous version

    Dec 18, 2019

    added 1 commit

    • dd160e6f - delete unused file

    Compare with previous version

    added 1 commit * dd160e6f - delete unused file [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/14/diffs?diff_id=4489&start_sha=2874f41969d90d31b56e08b753fa22cbf0465b11)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 18, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 18, 2019
    app/views/tops/index.html.erb
    21 23 </div>
    22 24
    23 25 <div class="top_industries">
    24 <h3>Top industries</h3>
    25
    26 <ul class="list-group list-group-horizontal">
    27 <%= render partial: "industries/industry", collection: @industries %>
    28 </ul>
    26 <%= render partial: "shared/top_industries"%>
    • Son Do Hong @sondh commented Dec 18, 2019
      Master

      <%= render "shared/top_industries" %>

      Edited Dec 18, 2019 by Son Do Hong
      `<%= render "shared/top_industries" %>`
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 18, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/14/diffs?diff_id=4490&start_sha=dd160e6ffbf4522d64961f6635f09314cf9d94c7#5119c960c4f642915a44495a130c317da9860885_26_26)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 18, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • e68f4427 - removed some div

    Compare with previous version

    Dec 18, 2019

    added 1 commit

    • e68f4427 - removed some div

    Compare with previous version

    added 1 commit * e68f4427 - removed some div [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/14/diffs?diff_id=4490&start_sha=dd160e6ffbf4522d64961f6635f09314cf9d94c7)
    Toggle commit list
  • Van Hau Le @haulv

    mentioned in commit 5d606475

    Dec 18, 2019

    mentioned in commit 5d606475

    mentioned in commit 5d606475d8969efe6b409f5faebd0a36ff836cf8
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Dec 18, 2019

    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
Nguyen Ngoc Nghia
Assignee
Nguyen Ngoc Nghia @nghiann
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: nghiann/VeNJOB!14
×

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.