Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/favorited_jobs origin/feature/favorited_jobs
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/favorited_jobs
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.
@nghiann assign return value of method to variable, not use it directly
@nghiann
@favorite_job = UserJob.find_or_initialize_by(user_id: current_user.id, job_id: job_id) unless @favorite_job.save! render json: {} end
UserJob.find_by(user_id: current_user.id, job_id: @job.id)&.applied_at
changed this line in version 2 of the diff
added 1 commit
Compare with previous version
resolved all discussions
mentioned in commit 97e95e9f
merged
