Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venjob_thanhnd
  • 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 3
    • Merge Requests 3
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • thanhnd
  • venjob_thanhnd
  • Merge Requests
  • !4

Merged
Opened Mar 04, 2020 by thanhnd@thanhnd 
  • Report abuse
Report abuse

Job list 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 job_list_page origin/job_list_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 job_list_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 10
  • Pipelines 8
  • Changes 27
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • thanhnd @thanhnd

    added 3 commits

    • 8b4e9b3b...c94c18ed - 2 commits from branch master
    • 0ff3b32e - Merge branch 'master' into 'job_list_page'

    Compare with previous version

    Mar 12, 2020

    added 3 commits

    • 8b4e9b3b...c94c18ed - 2 commits from branch master
    • 0ff3b32e - Merge branch 'master' into 'job_list_page'

    Compare with previous version

    added 3 commits * 8b4e9b3b...c94c18ed - 2 commits from branch `master` * 0ff3b32e - Merge branch 'master' into 'job_list_page' [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4740&start_sha=8b4e9b3b579ac218768678c3d50c6af329e7172b)
    Toggle commit list
  • thanhnd
    @thanhnd started a discussion on an old version of the diff Mar 12, 2020
    Last updated by thanhnd Mar 12, 2020
    app/controllers/jobs_controller.rb
    2 2 def show
    3 3 @job_detail = Job.find(params[:id])
    4 4 end
    5
    6 def index
    7 @job_list = Job.all
    • thanhnd @thanhnd commented Mar 12, 2020
      Master

      redundant

      redundant
    • thanhnd @thanhnd

      changed this line in version 4 of the diff

      Mar 12, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4743&start_sha=0ff3b32e484aa3b97dd430e29ab5557efaeb08a3#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_7_7)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd
    @thanhnd started a discussion on an old version of the diff Mar 12, 2020
    Last updated by thanhnd Mar 12, 2020
    app/controllers/jobs_controller.rb
    2 2 def show
    3 3 @job_detail = Job.find(params[:id])
    4 4 end
    5
    6 def index
    7 @job_list = Job.all
    8 @job_count = Job.count
    9 @pagin_job = Job.page(params[:page]).per(20)
    10 end
    11
    12 def search
    13 if params[:search].nil?
    14 redirect_to(root_path, alert: "Empty field!") and return
    • thanhnd @thanhnd commented Mar 12, 2020
      Master

      return redirect_to root_path, alert: "Empty field!"

      return redirect_to root_path, alert: "Empty field!"
    • thanhnd @thanhnd

      changed this line in version 4 of the diff

      Mar 12, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4743&start_sha=0ff3b32e484aa3b97dd430e29ab5557efaeb08a3#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_14_19)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd
    @thanhnd started a discussion on an old version of the diff Mar 12, 2020
    Last updated by thanhnd Mar 12, 2020
    app/controllers/jobs_controller.rb
    2 2 def show
    3 3 @job_detail = Job.find(params[:id])
    4 4 end
    5
    6 def index
    7 @job_list = Job.all
    8 @job_count = Job.count
    9 @pagin_job = Job.page(params[:page]).per(20)
    10 end
    11
    12 def search
    13 if params[:search].nil?
    14 redirect_to(root_path, alert: "Empty field!") and return
    15 else
    16 @job_count = Job.count
    17 @search_job = Job.where("job_name LIKE '%#{params[:search]}%'")
    • thanhnd @thanhnd commented Mar 12, 2020
      Master

      update to avoid sql injection error

      update to avoid sql injection error
    • thanhnd @thanhnd commented Mar 12, 2020
      Master

      page = params[:page].to_i page = page > 0 ? page : 1

      page = params[:page].to_i page = page > 0 ? page : 1
    • thanhnd @thanhnd

      changed this line in version 4 of the diff

      Mar 12, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4743&start_sha=0ff3b32e484aa3b97dd430e29ab5557efaeb08a3#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_17_21)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd
    @thanhnd started a discussion on an old version of the diff Mar 12, 2020
    Last updated by thanhnd Mar 12, 2020
    app/controllers/jobs_controller.rb
    2 2 def show
    3 3 @job_detail = Job.find(params[:id])
    4 4 end
    5
    6 def index
    7 @job_list = Job.all
    8 @job_count = Job.count
    9 @pagin_job = Job.page(params[:page]).per(20)
    10 end
    11
    12 def search
    13 if params[:search].nil?
    14 redirect_to(root_path, alert: "Empty field!") and return
    15 else
    16 @job_count = Job.count
    17 @search_job = Job.where("job_name LIKE '%#{params[:search]}%'")
    • thanhnd @thanhnd commented Mar 12, 2020
      Master

      update to avoid sql injection error

      update to avoid sql injection error
    • thanhnd @thanhnd

      changed this line in version 4 of the diff

      Mar 12, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4743&start_sha=0ff3b32e484aa3b97dd430e29ab5557efaeb08a3#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_17_21)
      Toggle commit list
    Please register or sign in to reply
  • thanhnd @thanhnd

    added 3 commits

    • eb055830 - fix conflict 20200312
    • b57da278 - fix review 20200312 Hau-san 1
    • 2aed6bef - Merge branch 'job_list_page' of gitlab.zigexn.vn:thanhnd/venjob_thanhnd into job_list_page

    Compare with previous version

    Mar 12, 2020

    added 3 commits

    • eb055830 - fix conflict 20200312
    • b57da278 - fix review 20200312 Hau-san 1
    • 2aed6bef - Merge branch 'job_list_page' of gitlab.zigexn.vn:thanhnd/venjob_thanhnd into job_list_page

    Compare with previous version

    added 3 commits * eb055830 - fix conflict 20200312 * b57da278 - fix review 20200312 Hau-san 1 * 2aed6bef - Merge branch 'job_list_page' of gitlab.zigexn.vn:thanhnd/venjob_thanhnd into job_list_page [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4743&start_sha=0ff3b32e484aa3b97dd430e29ab5557efaeb08a3)
    Toggle commit list
  • thanhnd @thanhnd

    added 1 commit

    • 1593bd44 - fix review 20200312 2

    Compare with previous version

    Mar 12, 2020

    added 1 commit

    • 1593bd44 - fix review 20200312 2

    Compare with previous version

    added 1 commit * 1593bd44 - fix review 20200312 2 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4744&start_sha=2aed6bef2f31c8944304f36cae81a7c82d4ece1e)
    Toggle commit list
  • thanhnd @thanhnd

    added 1 commit

    • 7f8e4bf7 - fix review 20200313 1

    Compare with previous version

    Mar 13, 2020

    added 1 commit

    • 7f8e4bf7 - fix review 20200313 1

    Compare with previous version

    added 1 commit * 7f8e4bf7 - fix review 20200313 1 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4745&start_sha=1593bd4423e885442b71d02aa4440f4596929b3d)
    Toggle commit list
  • thanhnd @thanhnd

    added 1 commit

    • 51bff2d7 - fix review 20200313 2

    Compare with previous version

    Mar 13, 2020

    added 1 commit

    • 51bff2d7 - fix review 20200313 2

    Compare with previous version

    added 1 commit * 51bff2d7 - fix review 20200313 2 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4746&start_sha=7f8e4bf715d45254635d5165d8b6c27fb3886c2b)
    Toggle commit list
  • thanhnd @thanhnd

    added 1 commit

    • 3d8e59dc - fix review 3

    Compare with previous version

    Mar 13, 2020

    added 1 commit

    • 3d8e59dc - fix review 3

    Compare with previous version

    added 1 commit * 3d8e59dc - fix review 3 [Compare with previous version](https://gitlab.zigexn.vn/thanhnd/venjob_thanhnd/merge_requests/4/diffs?diff_id=4747&start_sha=51bff2d796d677595ab23f41c07076fc33ad04c3)
    Toggle commit list
  • Van Hau Le @haulv

    enabled an automatic merge when the pipeline for 3d8e59dc succeeds

    Mar 13, 2020

    enabled an automatic merge when the pipeline for 3d8e59dc succeeds

    enabled an automatic merge when the pipeline for 3d8e59dc9b5cc919ec9111717b79c78c7cdbfeeb succeeds
    Toggle commit list
  • thanhnd @thanhnd

    canceled the automatic merge

    Mar 13, 2020

    canceled the automatic merge

    canceled the automatic merge
    Toggle commit list
  • thanhnd @thanhnd

    mentioned in commit b36f3848

    Mar 13, 2020

    mentioned in commit b36f3848

    mentioned in commit b36f3848549769742466a2e269d0f2d6491177cb
    Toggle commit list
  • thanhnd @thanhnd

    merged

    Mar 13, 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: thanhnd/venjob_thanhnd!4
×

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.