Merge branch 'es_global_search' into 'master'
ES: Global code search - [x] Basic implementation of blobs search - [x] Basic implementation of commits search - [x] Fix pagination for commits. Do paginating on ES level instead of resulting array - [x] Refactoring. The `gitlab-elastcsearch-git` gem should not know anything specific to GitLab application structure. - [ ] Backport changes to CE - [ ] Search result parsers (after review this MR) - [x] Removing `total_count` (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6216) - [x] Make rake tasks pass parent id - [x] Test database search afterwards - [x] Mention somewhere that ES should be updated to 2.4.0 - [x] Specs - [x] Address TODO in the code - [x] Add project name to search results Related MR for `gitlab-elasticsearch-git` gem (https://gitlab.com/gitlab-org/gitlab-elasticsearch-git/merge_requests/18) Screenshots: ![Screen_Shot_2016-09-06_at_16.07.30](/uploads/dca09ee14b9c728ab22b902ed471a071/Screen_Shot_2016-09-06_at_16.07.30.png) Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/556 See merge request !699
Showing
... | ... | @@ -108,7 +108,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Search | ||
gem 'elasticsearch-model' | ||
gem 'elasticsearch-rails' | ||
gem 'gitlab-elasticsearch-git', '~> 0.0.17', require: "elasticsearch/git" | ||
gem 'gitlab-elasticsearch-git', '~> 1.0.0', require: "elasticsearch/git" | ||
# Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | ||
... | ... |
Please register or sign in to comment