From 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Sat, 15 Dec 2018 10:06:56 +0100 Subject: Remove rails4 specific code --- lib/api/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api/helpers.rb') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 2cceb2ec798..a7d67a6300e 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -291,7 +291,7 @@ module API end end permitted_attrs = ActionController::Parameters.new(attrs).permit! - Gitlab.rails5? ? permitted_attrs.to_h : permitted_attrs + permitted_attrs.to_h end # rubocop: disable CodeReuse/ActiveRecord -- cgit v1.2.1