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 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Hoang Nam Nguyen
  • Venjob
  • Merge Requests
  • !7

Merged
Opened Oct 05, 2017 by Hoang Nam Nguyen@namnh 
  • Report abuse
Report abuse

History page

create history_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 history_page origin/history_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 history_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 9
  • Commits 3
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Hoang Nam Nguyen @namnh

    added 1 commit

    • be5a251e - 'finished history_page'

    Compare with previous version

    Oct 06, 2017

    added 1 commit

    • be5a251e - 'finished history_page'

    Compare with previous version

    added 1 commit * be5a251e - 'finished history_page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3737&start_sha=1d7582827e3cd269f476adf8f0aadeb760af9dab)
    Toggle commit list
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 09, 2017
    Last updated by Hoang Nam Nguyen Oct 10, 2017
    app/models/history.rb 0 → 100644
    1 class History < ApplicationRecord
    2 belongs_to :user
    3 belongs_to :job
    4
    5 scope :new_list_history, ->(num) { order(id: :desc).limit(num)}
    • Vinh Nguyen @vinhnx commented Oct 09, 2017

      @namnh latest_histories

      @namnh `latest_histories`
    • Hoang Nam Nguyen @namnh commented Oct 09, 2017
      Master

      yes i'm fix now . tks so much

      yes i'm fix now . tks so much
    • Hoang Nam Nguyen @namnh

      changed this line in version 4 of the diff

      Oct 10, 2017

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303#fe344c0863710402625ffa768b4c144a92ef1a22_5_5)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 09, 2017
    Last updated by Hoang Nam Nguyen Oct 10, 2017
    app/views/applies/new.html.erb
    21 25 <!--end set -->
    22 26 <!--set field all -->
    23 <%= form_for(@user_apply, url: new_info_path) do |f| %>
    24 <%= render 'shared/error_user_apply'%>
    25 <div class="row mt-3">
    26 <!--set field password -->
    27 <div class="col-md-2 mb-5">
    28 <strong><i class="text-danger"><%= f.label :name, "Full Name", class: 'form-label' %></i></strong>
    29 </div>
    30 <!--set field password -->
    31 <div class="col-md-10">
    32 <div class="input-group">
    33 <span class="input-group-addon"><i class="fa fa-user fa" aria-hidden="true"></i></span>
    34 <%= f.text_field :name, class: 'form-control' %>
    27 <%= form_for(@user_apply, url: new_info_path) do |f| %>
    28 <%= render 'shared/error_user_apply'%>
    • Vinh Nguyen @vinhnx commented Oct 09, 2017

      @namnh move form_for body to partial view

      @namnh move `form_for` body to partial view
    • Hoang Nam Nguyen @namnh commented Oct 10, 2017
      Master

      yes i fixed

      yes i fixed
    • Hoang Nam Nguyen @namnh

      changed this line in version 4 of the diff

      Oct 10, 2017

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303#4d6c45c0a1c4160cfb0bf69483d811c0fd5fdf75_28_22)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 09, 2017
    Last updated by Hoang Nam Nguyen Oct 10, 2017
    app/views/top_pages/_history.html.erb 0 → 100644
    8 <%= radio_button_tag 'job_history_id', history.job.id %>
    9 </div>
    10
    11 <div class="col-11" >
    12 <%= link_to history.job.job_title,job_detail_path(history.job.id),class: 'search_list_jobs_title' %>
    13 <% unless history.job.short_description.nil? %>
    14 <li class="detail_description">
    15 <%= truncate history.job.short_description,length: 250 %>
    16 <%= link_to 'read more',job_detail_path(history.job.id)%></li>
    17 </li>
    18 <% end %>
    19 <div class="row ml-0">
    20 <li class="detail_description col-md-5">
    21 <%= history.job.cities.map(&:location).join(',') %>
    22 </li>
    23 <% unless history.job.salary.nil? %>
    • Vinh Nguyen @vinhnx commented Oct 09, 2017

      @namnh instead of using unless, you can use if history.job.salary or if history.job.salary.present?, it's easier to read.

      @namnh instead of using `unless`, you can use `if history.job.salary` or `if history.job.salary.present?`, it's easier to read.
    • Hoang Nam Nguyen @namnh

      changed this line in version 4 of the diff

      Oct 10, 2017

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303#3190ad8dec92dcbd845b3f521bc062d5efbc51ee_23_23)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 09, 2017
    Last updated by Hoang Nam Nguyen Oct 10, 2017
    app/views/users/_my_jobs.html.erb
    3 3 <div class="search_list titlejob col-md-10">
    4 4
    5 5 <%= link_to apply.job.job_title,job_detail_path(apply.job.id),class: 'search_list_jobs_title' %>
    6 <% unless apply.job.short_description.nil? %>
    6 <% if apply.job.short_description.present? %>
    7 <%= binding.pry %>
    • Vinh Nguyen @vinhnx commented Oct 09, 2017

      @namnh please remove debug code.

      @namnh please remove debug code.
    • Hoang Nam Nguyen @namnh commented Oct 09, 2017
      Master

      yes i remove now

      yes i remove now
    • Hoang Nam Nguyen @namnh

      changed this line in version 4 of the diff

      Oct 10, 2017

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303#050e1183d3a5cefc005778179aa782e3d69ece18_7_7)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 09, 2017
    Last updated by Hoang Nam Nguyen Oct 10, 2017
    app/views/users/_my_jobs.html.erb
    3 3 <div class="search_list titlejob col-md-10">
    4 4
    5 5 <%= link_to apply.job.job_title,job_detail_path(apply.job.id),class: 'search_list_jobs_title' %>
    6 <% unless apply.job.short_description.nil? %>
    6 <% if apply.job.short_description.present? %>
    7 <%= binding.pry %>
    • Vinh Nguyen @vinhnx commented Oct 09, 2017

      please remove debug code

      please remove debug code
    • Hoang Nam Nguyen @namnh commented Oct 09, 2017
      Master

      yes i remote now

      yes i remote now
    • Hoang Nam Nguyen @namnh

      changed this line in version 4 of the diff

      Oct 10, 2017

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303#050e1183d3a5cefc005778179aa782e3d69ece18_7_7)
      Toggle commit list
    Please register or sign in to reply
  • Hoang Nam Nguyen @namnh

    added 1 commit

    • 30dad39a - 'finished fix review'

    Compare with previous version

    Oct 10, 2017

    added 1 commit

    • 30dad39a - 'finished fix review'

    Compare with previous version

    added 1 commit * 30dad39a - &#x27;finished fix review&#x27; [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/7/diffs?diff_id=3757&start_sha=be5a251ece2639c386d544bd193e1814fd5f6303)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    merged

    Oct 10, 2017

    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: namnh/Venjob!7