diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-20 11:50:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-20 11:50:55 +0000 |
| commit | 1a0ee66275316109af1911f96651ca10be930e75 (patch) | |
| tree | e57c8a92daffd69469ef754320a021ed63c1067c | |
| parent | 386a04999743c794bd08badda7aef42f81e727da (diff) | |
| parent | e3046dcabe6d87eefd37ba124d42bcb721ec0a6c (diff) | |
| download | gitlab-ce-1a0ee66275316109af1911f96651ca10be930e75.tar.gz | |
Merge branch 'rails5-fix-48142' into 'master'
Rails5 fix Admin::HooksController
Closes #48142
See merge request gitlab-org/gitlab-ce!20017
| -rw-r--r-- | app/controllers/admin/hooks_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-48142.yml | 5 |
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 |