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

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

create ID12 - ID8 - ID9

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b ID12-8-9 origin/ID12-8-9

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 ID12-8-9

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 4
  • Commits 12
  • Pipelines 12
  • Changes 31
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tô Ngọc Ánh @anhtn

    added 15 commits

    • eefc3fcf...a88e34a0 - 14 commits from branch master
    • 146f451f - resolve conflict

    Compare with previous version

    Aug 20, 2020

    added 15 commits

    • eefc3fcf...a88e34a0 - 14 commits from branch master
    • 146f451f - resolve conflict

    Compare with previous version

    added 15 commits * eefc3fcf...a88e34a0 - 14 commits from branch `master` * 146f451f - resolve conflict [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5119&start_sha=eefc3fcfaa89df0ac2d92f99d38d3064368945e3)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • a7e94105 - func create, destroy favorite

    Compare with previous version

    Aug 20, 2020

    added 1 commit

    • a7e94105 - func create, destroy favorite

    Compare with previous version

    added 1 commit * a7e94105 - func create, destroy favorite [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5120&start_sha=146f451f810b59be722d752cbacce595ff5e93f5)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 43181c91 - Favorite page

    Compare with previous version

    Aug 21, 2020

    added 1 commit

    • 43181c91 - Favorite page

    Compare with previous version

    added 1 commit * 43181c91 - Favorite page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5124&start_sha=a7e941052a0f342bc6fab3ae482648ec5c7614c5)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • e84e7846 - remove redundant file

    Compare with previous version

    Aug 21, 2020

    added 1 commit

    • e84e7846 - remove redundant file

    Compare with previous version

    added 1 commit * e84e7846 - remove redundant file [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5125&start_sha=43181c915b8e639ff8ac9db4cf98c33782dc3439)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • edb1419c - check authenticate favorite action, history view

    Compare with previous version

    Aug 21, 2020

    added 1 commit

    • edb1419c - check authenticate favorite action, history view

    Compare with previous version

    added 1 commit * edb1419c - check authenticate favorite action, history view [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5128&start_sha=e84e78469ab437c3447d9584a7894bd7544e0d3f)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • f5e77b66 - histories list

    Compare with previous version

    Aug 21, 2020

    added 1 commit

    • f5e77b66 - histories list

    Compare with previous version

    added 1 commit * f5e77b66 - histories list [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5129&start_sha=edb1419cb402f5ab29a940185ee7bf807bf3086b)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 24, 2020
    Resolved by Tô Ngọc Ánh Aug 24, 2020
    app/controllers/application_controller.rb
    7 8 devise_parameter_sanitizer.permit(:sign_up, keys: [:full_name, :curriculum_vitae])
    8 9 devise_parameter_sanitizer.permit(:account_update, keys: [:full_name, :curriculum_vitae])
    9 10 end
    11
    12 private
    13
    14 def storable_location?
    15 request.get? && is_navigational_format? && !devise_controller? && !request.xhr?
    16 end
    17
    18 def store_user_location!
    • Thanh Hung Pham @hungpt commented Aug 24, 2020
      Master

      @anhtn Dấu ! ý nghĩa là gì vậy em?

      @anhtn Dấu `!` ý nghĩa là gì vậy em?
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 24, 2020
    Resolved by Tô Ngọc Ánh Aug 24, 2020
    app/controllers/histories_controller.rb 0 → 100644
    1 class HistoriesController < ApplicationController
    2 before_action :authenticate_user!
    3
    4 def index
    5 histories = current_user.histories.order(created_at: :asc).take(20).pluck(:job_id)
    • Thanh Hung Pham @hungpt commented Aug 24, 2020
      Master

      @anhtn Đặt constant nha em! 20

      Edited Aug 24, 2020
      @anhtn Đặt constant nha em! `20`
    • Tô Ngọc Ánh @anhtn

      changed this line in version 8 of the diff

      Aug 24, 2020

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5140&start_sha=f5e77b6637b49a111600b1fc52d9d8fb16aaa674#7b5d95868f77b79b5fd7082706857062a350373f_5_5)
      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 24, 2020
    Resolved by Tô Ngọc Ánh Aug 24, 2020
    app/views/favorites/index.html.erb 0 → 100644
    1 <div class="my-4">
    2 <h3 class='text-center'>Favorited Jobs</h3>
    3 <hr class="divider">
    4 <div class='content'>
    5 <%= paginate @jobs %>
    6 <%= render 'favorites/job', jobs: @jobs if @jobs.any? %>
    • Thanh Hung Pham @hungpt commented Aug 24, 2020
      Master

      @anhtn Tên file vơi số nhiều favorites/jobs

      Edited Aug 24, 2020
      @anhtn Tên file vơi số nhiều `favorites/jobs`
    • Tô Ngọc Ánh @anhtn

      changed this line in version 8 of the diff

      Aug 24, 2020

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5140&start_sha=f5e77b6637b49a111600b1fc52d9d8fb16aaa674#0bb9ee06e5454a072f52e892af0a3dbdad9c0988_6_5)
      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 24, 2020
    Resolved by Tô Ngọc Ánh Aug 24, 2020
    app/views/histories/_job.html.erb 0 → 100644
    1 <%= form_tag new_applied_job_path, method: :get, enforce_utf8: false do %>
    • Thanh Hung Pham @hungpt commented Aug 24, 2020
      Master

      @anhtn Nội dung file này giống với favorites/_job.html.erb Move ra partial chung được không em?

      Edited Aug 24, 2020
      @anhtn Nội dung file này giống với `favorites/_job.html.erb` Move ra partial chung được không em?
    • Tô Ngọc Ánh @anhtn

      changed this line in version 8 of the diff

      Aug 24, 2020

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5140&start_sha=f5e77b6637b49a111600b1fc52d9d8fb16aaa674#41523614174637594434e361d82e256cb5b3e125_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 37cb0f75 - split job_body partial,show history

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • 37cb0f75 - split job_body partial,show history

    Compare with previous version

    added 1 commit * 37cb0f75 - split job_body partial,show history [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5140&start_sha=f5e77b6637b49a111600b1fc52d9d8fb16aaa674)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Aug 24, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • eb291848 - rake task delete history if size > limit

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • eb291848 - rake task delete history if size > limit

    Compare with previous version

    added 1 commit * eb291848 - rake task delete history if size &gt; limit [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5142&start_sha=37cb0f7566b2fc1338f2574a8fb3dddfd64ebb89)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 9072697a - load previous favorite page if page empty

    Compare with previous version

    Aug 25, 2020

    added 1 commit

    • 9072697a - load previous favorite page if page empty

    Compare with previous version

    added 1 commit * 9072697a - load previous favorite page if page empty [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5145&start_sha=eb29184874c9d921d3d1d2e6c50980a7b0092853)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 35464aa1 - add message notice if result is blank

    Compare with previous version

    Aug 25, 2020

    added 1 commit

    • 35464aa1 - add message notice if result is blank

    Compare with previous version

    added 1 commit * 35464aa1 - add message notice if result is blank [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5146&start_sha=9072697a77d0c6906ee26e8a72dcf73f44493d3c)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 41d94cb7 - add message notice if result is blank

    Compare with previous version

    Aug 25, 2020

    added 1 commit

    • 41d94cb7 - add message notice if result is blank

    Compare with previous version

    added 1 commit * 41d94cb7 - add message notice if result is blank [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/13/diffs?diff_id=5147&start_sha=35464aa1016b6bd17379f771cec451c69bbb36dc)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    mentioned in commit 163f2be9

    Aug 25, 2020

    mentioned in commit 163f2be9

    mentioned in commit 163f2be9459d590459dbfa8583933a6f0b30a591
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    merged

    Aug 25, 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!13
×

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.