diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
commit | 4657c28777dfc2729261f895f8e36cbef51395bc (patch) | |
tree | 86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /lib/api/projects.rb | |
parent | 5456859b5b28baca95ced74179a349563498a5f0 (diff) | |
parent | daaaf5ef9f182761ac07d76d24d971765134c7e1 (diff) | |
download | gitlab-ce-fix/keep-artifacts-button-visibility.tar.gz |
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits)
Conflicts:
spec/models/build_spec.rb
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r-- | lib/api/projects.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 3be14e8eb76..7c66c340562 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -159,7 +159,7 @@ module API use :sort_params use :pagination end - get "/search/:query" do + get "/search/:query", requirements: { query: /[^\/]+/ } do search_service = Search::GlobalService.new(current_user, search: params[:query]).execute projects = search_service.objects('projects', params[:page]) projects = projects.reorder(params[:order_by] => params[:sort]) |