diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-15 10:06:56 +0100 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-16 10:48:41 +0100 |
| commit | 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 (patch) | |
| tree | 5a21667acd7d431f155d12227181dcfc6d21cba8 /lib/api/helpers.rb | |
| parent | 8b4602041cf2c4a8738a4796d78720017249249f (diff) | |
| download | gitlab-ce-56296f1edadf2bc5f7741cbb3f97cb41f090aac6.tar.gz | |
Remove rails4 specific code
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |