diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2016-02-09 14:36:12 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-02-22 12:10:56 +0100 |
| commit | 829830ae9df9e777716e03fa393a328d3ff882b0 (patch) | |
| tree | 171bd286ba08e28fd1819d7e7ac32cfe3a322f9d | |
| parent | df27b3a1742048358674733d9cb3392348d5e964 (diff) | |
| download | gitlab-ce-829830ae9df9e777716e03fa393a328d3ff882b0.tar.gz | |
Fix loading data when no author_id is passed
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 23f2ab45ff4..5d81a996fba 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -15,7 +15,7 @@ class AutocompleteController < ApplicationController @users = [*@users, current_user] end - if params[:author_id] + unless params[:author_id] == "false" @users = [User.find(params[:author_id]), *@users] end diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 2afbdfae664..e472381ba36 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -23,8 +23,8 @@ module MergeRequests private - def filter_params(issueable = nil) - super(:merge_request, issueable) + def filter_params(issuable = nil) + super(:merge_request, issuable) end end end |