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 1
    • Issues 1
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 3
    • Merge Requests 3
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Xuan Trung Le
  • venjob
  • Merge Requests
  • !11

Merged
Opened Nov 15, 2017 by Xuan Trung Le@trunglx 
  • Report abuse
Report abuse

Add search feature use solr

I have created a feature for searching by using Solr.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b features/create_search_form origin/features/create_search_form

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 features/create_search_form

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 2
  • Commits 4
  • Changes 6
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Xuan Trung Le @trunglx

    added 1 commit

    • ca2ebce3 - fix bugs

    Compare with previous version

    Nov 15, 2017

    added 1 commit

    • ca2ebce3 - fix bugs

    Compare with previous version

    added 1 commit * ca2ebce3 - fix bugs [Compare with previous version](https://gitlab.zigexn.vn/trunglx/venjob/merge_requests/11/diffs?diff_id=3857&start_sha=5e9f7e2ef9011c0af0480361c231a1c36f0bc1f0)
    Toggle commit list
  • Ba Toi Dang
    @toidb started a discussion on the diff Nov 15, 2017
    Resolved by Xuan Trung Le Nov 16, 2017
    app/controllers/jobs_controller.rb
    14 15 city = City.find(params[:city_id])
    15 16 @jobs = city.jobs.includes(:company).page(params[:page])
    16 17 @result = "jobs/City/#{city.name}"
    18 @jobs_count = @jobs.count
    • Ba Toi Dang @toidb commented Nov 15, 2017
      Master

      @trunglx please check here again because this always returns the number of jobs less or equal than page's limitation.

      Please check others.

      Edited Nov 15, 2017 by Ba Toi Dang
      @trunglx please check here again because this always returns the number of jobs less or equal than page's limitation. Please check others.
    • Xuan Trung Le @trunglx commented Nov 16, 2017
      Master

      fixed.

      fixed.
    Please register or sign in to reply
  • Xuan Trung Le @trunglx

    added 1 commit

    • b408137f - fix bugs

    Compare with previous version

    Nov 16, 2017

    added 1 commit

    • b408137f - fix bugs

    Compare with previous version

    added 1 commit * b408137f - fix bugs [Compare with previous version](https://gitlab.zigexn.vn/trunglx/venjob/merge_requests/11/diffs?diff_id=3860&start_sha=ca2ebce3ab3994c5d68b5a510a6ebf6abfa81b7a)
    Toggle commit list
  • Xuan Trung Le @trunglx

    resolved all discussions

    Nov 16, 2017

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Xuan Trung Le @trunglx

    added 20 commits

    • b408137f...b94adaf7 - 16 commits from branch master
    • 39a69b3a - Add search feature use solr
    • 1bcca230 - fix bugs
    • 38fd30a0 - fix bugs
    • d82c2c39 - fix bugs

    Compare with previous version

    Nov 17, 2017

    added 20 commits

    • b408137f...b94adaf7 - 16 commits from branch master
    • 39a69b3a - Add search feature use solr
    • 1bcca230 - fix bugs
    • 38fd30a0 - fix bugs
    • d82c2c39 - fix bugs

    Compare with previous version

    added 20 commits * b408137f...b94adaf7 - 16 commits from branch `master` * 39a69b3a - Add search feature use solr * 1bcca230 - fix bugs * 38fd30a0 - fix bugs * d82c2c39 - fix bugs [Compare with previous version](https://gitlab.zigexn.vn/trunglx/venjob/merge_requests/11/diffs?diff_id=3864&start_sha=b408137f3ca194d1129159d3ae1ab21d914a547c)
    Toggle commit list
  • Ba Toi Dang @toidb

    mentioned in commit ee7d2c4f

    Nov 17, 2017

    mentioned in commit ee7d2c4f

    mentioned in commit ee7d2c4fcce8f3532943b122a72c5e93633c701a
    Toggle commit list
  • Ba Toi Dang @toidb

    merged

    Nov 17, 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
Xuan Trung Le
Assignee
Xuan Trung Le @trunglx
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: trunglx/venjob!11
×

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.