Commit f00c32e3 authored by Andy Soiron's avatar Andy Soiron

Merge branch 'fix/private-method-load-called' into 'master'

Fix 'private method 'load' called' when posting non-whitelisted webhook

See merge request gitlab-org/gitlab!72672
parents 89d1ab2d 0fcfb496
...@@ -9,7 +9,7 @@ class Admin::HooksController < Admin::ApplicationController ...@@ -9,7 +9,7 @@ class Admin::HooksController < Admin::ApplicationController
urgency :low, [:test] urgency :low, [:test]
def index def index
@hooks = SystemHook.all @hooks = SystemHook.all.load
@hook = SystemHook.new @hook = SystemHook.new
end end
......
...@@ -16,7 +16,7 @@ class Projects::HooksController < Projects::ApplicationController ...@@ -16,7 +16,7 @@ class Projects::HooksController < Projects::ApplicationController
urgency :low, [:test] urgency :low, [:test]
def index def index
@hooks = @project.hooks @hooks = @project.hooks.load
@hook = ProjectHook.new @hook = ProjectHook.new
end end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.card-header .card-header
%h5 %h5
= hook_class.underscore.humanize.titleize.pluralize = hook_class.underscore.humanize.titleize.pluralize
(#{hooks.load.size}) (#{hooks.size})
- if hooks.any? - if hooks.any?
%ul.content-list %ul.content-list
......
...@@ -18,7 +18,7 @@ class Groups::HooksController < Groups::ApplicationController ...@@ -18,7 +18,7 @@ class Groups::HooksController < Groups::ApplicationController
urgency :low, [:test] urgency :low, [:test]
def index def index
@hooks = @group.hooks @hooks = @group.hooks.load
@hook = GroupHook.new @hook = GroupHook.new
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment