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
urgency :low, [:test]
def index
@hooks = SystemHook.all
@hooks = SystemHook.all.load
@hook = SystemHook.new
end
......
......@@ -16,7 +16,7 @@ class Projects::HooksController < Projects::ApplicationController
urgency :low, [:test]
def index
@hooks = @project.hooks
@hooks = @project.hooks.load
@hook = ProjectHook.new
end
......
......@@ -3,7 +3,7 @@
.card-header
%h5
= hook_class.underscore.humanize.titleize.pluralize
(#{hooks.load.size})
(#{hooks.size})
- if hooks.any?
%ul.content-list
......
......@@ -18,7 +18,7 @@ class Groups::HooksController < Groups::ApplicationController
urgency :low, [:test]
def index
@hooks = @group.hooks
@hooks = @group.hooks.load
@hook = GroupHook.new
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