summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-06-20 08:25:29 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-06-20 08:30:24 +0200
commite3046dcabe6d87eefd37ba124d42bcb721ec0a6c (patch)
treeb1126fdee476cbacfcb4ed6197a61485049c20a2
parentf7b59b9f14014aab7d4d3e23e3565829d028c870 (diff)
downloadgitlab-ce-e3046dcabe6d87eefd37ba124d42bcb721ec0a6c.tar.gz
Rails5 fix Admin::HooksController
-rw-r--r--app/controllers/admin/hooks_controller.rb2
-rw-r--r--changelogs/unreleased/rails5-fix-48142.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb
index 2b47819303e..fb788c47ef1 100644
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -9,7 +9,7 @@ class Admin::HooksController < Admin::ApplicationController
end
def create
- @hook = SystemHook.new(hook_params)
+ @hook = SystemHook.new(hook_params.to_h)
if @hook.save
redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
diff --git a/changelogs/unreleased/rails5-fix-48142.yml b/changelogs/unreleased/rails5-fix-48142.yml
new file mode 100644
index 00000000000..bfd95cfbe8b
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48142.yml
@@ -0,0 +1,5 @@
+---
+title: Rails5 fix Admin::HooksController
+merge_request: 20017
+author: Jasper Maes
+type: fixed