Fix loading data when no author_id is passed

829830ae · Zeger-Jan van de Weg · Zeger-Jan van de Weg · df27b3a1 · 829830ae · 829830ae
Commit 829830ae authored Feb 09, 2016 by Zeger-Jan van de Weg Committed by Zeger-Jan van de Weg Feb 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

autocomplete_controller.rb app/controllers/autocomplete_controller.rb +1 -1

base_service.rb app/services/merge_requests/base_service.rb +2 -2

No files found.
--- 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

--- 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)
+    def filter_params(issuable = nil)
-      super(:merge_request, issueable)
+      super(:merge_request, issuable)
    end
  end
 end