diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-06-17 15:22:44 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-06-17 15:22:44 -0300 |
| commit | d9df2f730b4eaab4e2d1b5f5045e34bb14e3486f (patch) | |
| tree | 050490a4e90601ad4d175ba6674b98f35937587e /app/controllers/search_controller.rb | |
| parent | 66b9ca952aa4104f99c1275566e8b5c7d28fce01 (diff) | |
| parent | d2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff) | |
| download | gitlab-ce-issue_60515.tar.gz | |
Merge branch 'master' into issue_60515issue_60515
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index cb25548c83f..a80ab3bcd28 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -25,7 +25,6 @@ class SearchController < ApplicationController @show_snippets = search_service.show_snippets? @search_results = search_service.search_results @search_objects = search_service.search_objects - @display_options = search_service.display_options render_commits if @scope == 'commits' eager_load_user_status if @scope == 'users' |