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

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

Apply page

Create apply jobs

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b apply_page origin/apply_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 apply_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 5
  • Commits 8
  • Changes 64
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Hoang Nam Nguyen @namnh

    added 4 commits

    • 28f078e1 - 1 commit from branch master
    • b47a7818 - Merge branch 'apply_page' of gitlab.zigexn.vn:namnh/Venjob into apply_page
    • 5080eb67 - file fix
    • fdf3dc0c - 'fixed forgot_page'

    Compare with previous version

    Oct 03, 2017

    added 4 commits

    • 28f078e1 - 1 commit from branch master
    • b47a7818 - Merge branch 'apply_page' of gitlab.zigexn.vn:namnh/Venjob into apply_page
    • 5080eb67 - file fix
    • fdf3dc0c - 'fixed forgot_page'

    Compare with previous version

    added 4 commits * 28f078e1 - 1 commit from branch `master` * b47a7818 - Merge branch 'apply_page' of gitlab.zigexn.vn:namnh/Venjob into apply_page * 5080eb67 - file fix * fdf3dc0c - 'fixed forgot_page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3677&start_sha=4545c46ec33ce8936c4b8304a49a2ca807d034c1)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    added 1 commit

    • 972348f5 - 'finish apply_page'

    Compare with previous version

    Oct 05, 2017

    added 1 commit

    • 972348f5 - 'finish apply_page'

    Compare with previous version

    added 1 commit * 972348f5 - 'finish apply_page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3704&start_sha=fdf3dc0c0983f0bd638ef929a7352c4286564357)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    added 2 commits

    • 74cb245e - files
    • 44f4d89b - 'finish applied_job_page'

    Compare with previous version

    Oct 05, 2017

    added 2 commits

    • 74cb245e - files
    • 44f4d89b - 'finish applied_job_page'

    Compare with previous version

    added 2 commits * 74cb245e - files * 44f4d89b - 'finish applied_job_page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3713&start_sha=972348f5f9dfa1e581b921e3a8dca433fa5cf658)
    Toggle commit list
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 06, 2017
    Last updated by Hoang Nam Nguyen Oct 06, 2017
    app/controllers/applies_controller.rb 0 → 100644
    1 class AppliesController < ApplicationController
    2
    3 def new
    4 @user_apply = Apply.new(session[:apply] || {})
    5 end
    6
    7 def create
    8 return if current_user.nil?
    • Vinh Nguyen @vinhnx commented Oct 06, 2017

      @namnh should you before_filter to redirect to login page for this controller.

      @namnh should you `before_filter` to redirect to login page for this controller.
    • Hoang Nam Nguyen @namnh

      changed this line in version 6 of the diff

      Oct 06, 2017

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3738&start_sha=44f4d89bb22b3f499deff26e6aa40b74c7542062#d9c45092651a193b7c63a6a3b87ae6db5b912ec9_8_9)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 06, 2017
    Last updated by Hoang Nam Nguyen Oct 06, 2017
    app/controllers/applies_controller.rb 0 → 100644
    1 class AppliesController < ApplicationController
    2
    3 def new
    4 @user_apply = Apply.new(session[:apply] || {})
    5 end
    6
    7 def create
    8 return if current_user.nil?
    9 @user_apply = Apply.new(user_apply_job)
    10 @user_apply.job_id = Job.find(params[:id]).id
    11 @user_apply.user_id = @current_user.id
    12 if @user_apply.valid?
    13 session[:apply] = @user_apply.as_json
    • Vinh Nguyen @vinhnx commented Oct 06, 2017

      @namnh no need to call as_json

      @namnh no need to call `as_json`
    • Hoang Nam Nguyen @namnh commented Oct 06, 2017
      Master

      yes, i got it. tks

      yes, i got it. tks
    • Hoang Nam Nguyen @namnh

      changed this line in version 6 of the diff

      Oct 06, 2017

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3738&start_sha=44f4d89bb22b3f499deff26e6aa40b74c7542062#d9c45092651a193b7c63a6a3b87ae6db5b912ec9_13_13)
      Toggle commit list
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on an old version of the diff Oct 06, 2017
    Last updated by Hoang Nam Nguyen Oct 06, 2017
    app/views/users/_my_jobs.html.erb 0 → 100644
    1 <div class="container mt-5" >
    2 <div class="row mb-5 ml-5">
    3 <div class="search_list titlejob col-md-10">
    4
    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? %>
    • Vinh Nguyen @vinhnx commented Oct 06, 2017

      @namnh if present?

      @namnh `if present?`
    • Hoang Nam Nguyen @namnh commented Oct 06, 2017
      Master

      yes i got it . tks so much

      yes i got it . tks so much
    • Hoang Nam Nguyen @namnh

      changed this line in version 6 of the diff

      Oct 06, 2017

      changed this line in version 6 of the diff

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

    added 1 commit

    • 2d2646d2 - 'fixed apply_page'

    Compare with previous version

    Oct 06, 2017

    added 1 commit

    • 2d2646d2 - 'fixed apply_page'

    Compare with previous version

    added 1 commit * 2d2646d2 - &#x27;fixed apply_page&#x27; [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/6/diffs?diff_id=3738&start_sha=44f4d89bb22b3f499deff26e6aa40b74c7542062)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    merged

    Oct 09, 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!6