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 Hoang Mai Phuong
  • VeNJOB
  • Merge Requests
  • !8

Merged
Opened Aug 16, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

store-file-cv

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b store-file-cv origin/store-file-cv

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 store-file-cv

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 4
  • Pipelines 4
  • Changes 6
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 769fc198 - edit-savetouchsave

    Compare with previous version

    Aug 16, 2021

    added 1 commit

    • 769fc198 - edit-savetouchsave

    Compare with previous version

    added 1 commit * 769fc198 - edit-savetouchsave [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/8/diffs?diff_id=5420&start_sha=104ff7703e7aae099ec7f96e79c934947eaae53b)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 16, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 16, 2021
    app/controllers/apply_jobs_controller.rb
    1 1 class ApplyJobsController < ApplicationController
    2
    2 3 def new
    3 4 job = Job.find_by(id: params[:job_id])
    4 5 return root_path unless job
    5 6
    6 @apply_job = if session[:apply_job].present?
    7 ApplyJob.new(session[:apply_job])
    8 else
    9 ApplyJob.new
    10 end
    11 @apply_job.job_id = job.id
    7 if session[:apply_job].present?
    8 @apply_job = ApplyJob.new(session[:apply_job])
    9 @blob = ActiveStorage::Blob.find(session[:id])
    • Thanh Hung Pham @hungpt commented Aug 16, 2021
      Master

      @phuongnhm

      • Nên sửa lại session[:id] -> session[:blob_id]
      • Nên kiểm tra session[:blob_id] có mình mới xử lý chỗ này nha em.
      @phuongnhm - Nên sửa lại `session[:id]` -> `session[:blob_id]` - Nên kiểm tra `session[:blob_id]` có mình mới xử lý chỗ này nha em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Aug 16, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/8/diffs?diff_id=5421&start_sha=769fc19863c3e9fef2a3a20c452d64eef509e9ee#1aa63f12b57deb09a31d654c4c38ec55a37edc67_9_9)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 1bf09fb6 - check-present-session-blob-id

    Compare with previous version

    Aug 16, 2021

    added 1 commit

    • 1bf09fb6 - check-present-session-blob-id

    Compare with previous version

    added 1 commit * 1bf09fb6 - check-present-session-blob-id [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/8/diffs?diff_id=5421&start_sha=769fc19863c3e9fef2a3a20c452d64eef509e9ee)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • bc2c5d35 - fix-store-cv-when-back-to-new

    Compare with previous version

    Aug 17, 2021

    added 1 commit

    • bc2c5d35 - fix-store-cv-when-back-to-new

    Compare with previous version

    added 1 commit * bc2c5d35 - fix-store-cv-when-back-to-new [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/8/diffs?diff_id=5429&start_sha=1bf09fb6df1b709a932a4849542efcbc5a96222b)
    Toggle commit list
  • Thanh Hung Pham @hungpt

    mentioned in commit 45fb6219

    Aug 17, 2021

    mentioned in commit 45fb6219

    mentioned in commit 45fb62194f0f402b16f69f1a63f961de08a65b91
    Toggle commit list
  • Thanh Hung Pham @hungpt

    merged

    Aug 17, 2021

    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: phuongnhm/VeNJOB!8
×

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.