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

Open
Opened Sep 07, 2020 by Tô Ngọc Ánh@anhtn 
  • Report abuse
Report abuse

Admin

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b admin origin/admin

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 admin

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

    added 1 commit

    • cd4fd2f1 - Apply decorator pattern for applied_job created_at

    Compare with previous version

    Sep 08, 2020

    added 1 commit

    • cd4fd2f1 - Apply decorator pattern for applied_job created_at

    Compare with previous version

    added 1 commit * cd4fd2f1 - Apply decorator pattern for applied_job created_at [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5191&start_sha=4be6e76ab5688088842756b43de0ea1b52a7d2d9)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • f25be8dc - [1] admin search applied job

    Compare with previous version

    Sep 09, 2020

    added 1 commit

    • f25be8dc - [1] admin search applied job

    Compare with previous version

    added 1 commit * f25be8dc - [1] admin search applied job [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5196&start_sha=cd4fd2f11e63ac312fa0fa2e6b6879f070a93195)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 55b2b499 - decrease query in view applied_job

    Compare with previous version

    Sep 09, 2020

    added 1 commit

    • 55b2b499 - decrease query in view applied_job

    Compare with previous version

    added 1 commit * 55b2b499 - decrease query in view applied_job [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5198&start_sha=f25be8dc3d4e72722a1bc338d99ad551c732066e)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 9a91355f - fix redirect path name if is_admin

    Compare with previous version

    Sep 10, 2020

    added 1 commit

    • 9a91355f - fix redirect path name if is_admin

    Compare with previous version

    added 1 commit * 9a91355f - fix redirect path name if is_admin [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5199&start_sha=55b2b4996d17ac2f557fdb6ada662ab16dfe7a29)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 4552c30b - CSV download

    Compare with previous version

    Sep 10, 2020

    added 1 commit

    • 4552c30b - CSV download

    Compare with previous version

    added 1 commit * 4552c30b - CSV download [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5201&start_sha=9a91355f241213746ba772081cb560e013ebc149)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • e54b8a31 - fix bug can't access /admin/applies

    Compare with previous version

    Sep 11, 2020

    added 1 commit

    • e54b8a31 - fix bug can't access /admin/applies

    Compare with previous version

    added 1 commit * e54b8a31 - fix bug can't access /admin/applies [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/15/diffs?diff_id=5202&start_sha=4552c30b685be6356494a98b04cbad8f3fdf6cfc)
    Toggle commit list
  • Tô Ngọc Ánh
    @anhtn started a discussion on the diff Sep 11, 2020
    Last updated by Tô Ngọc Ánh Sep 17, 2020
    app/controllers/applied_jobs_controller.rb
    33 33 end
    34 34 end
    35 35
    36 def search
    37 return unless current_user.admin
    38
    39 get_data_search_bar
    40 @date, @applied_jobs = SearchAppliedJobsService.search(params)
    41 respond_to do |format|
    42 format.html { render 'users/applied_jobs' }
    43 format.csv {
    44 send_data ExportCsvService.new(@applied_jobs, AppliedJob::CSV_ATTRIBUTES).perform,
    • Tô Ngọc Ánh @anhtn commented Sep 11, 2020
      Master

      bug: k download được all applied job

      bug: k download được all applied job
    • Thanh Hung Pham @hungpt commented Sep 11, 2020
      Master

      @anhtn Sao vậy em?

      @anhtn Sao vậy em?
    • Tô Ngọc Ánh @anhtn commented Sep 17, 2020
      Master

      @hungpt nó đang lỗi chỗ này do default cái date_select lúc nào cũng có ngày sẵn, em note lại cho khỏi quên

      @hungpt nó đang lỗi chỗ này do default cái date_select lúc nào cũng có ngày sẵn, em note lại cho khỏi quên
    Please register or sign in to reply
  • 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!15