kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rails5-fix-48142' into 'master' 

Rails5 fix Admin::HooksController

Closes #48142

See merge request gitlab-org/gitlab-ce!20017
This commit is contained in:
Rémy Coutable 2018-06-20 11:50:55 +00:00
parent 386a049997 e3046dcabe
commit 1a0ee66275
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/hooks_controller.rb
View File

@ -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.'

5
changelogs/unreleased/rails5-fix-48142.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Rails5 fix Admin::HooksController
merge_request: 20017
author: Jasper Maes
type: fixed