From 829830ae9df9e777716e03fa393a328d3ff882b0 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Tue, 9 Feb 2016 14:36:12 +0100
Subject: [PATCH] Fix loading data when no author_id is passed
---
app/controllers/autocomplete_controller.rb | 2 +-
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
--
GitLab