From 39a25e5d45c6dbbed23bbbd686c1db806effaf48 Mon Sep 17 00:00:00 2001 From: Lee Tickett Date: Wed, 1 Mar 2023 09:52:59 +0000 Subject: [PATCH 1/2] Fix unselectable group webhooks A bug prevents enabling group webhooks for confidential note events and feature flag events. Changelog: fixed EE: true --- ee/app/models/hooks/group_hook.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ee/app/models/hooks/group_hook.rb b/ee/app/models/hooks/group_hook.rb index de3a967ee16aba..50c1d9c7aee869 100644 --- a/ee/app/models/hooks/group_hook.rb +++ b/ee/app/models/hooks/group_hook.rb @@ -25,7 +25,9 @@ class GroupHook < WebHook :deployment_hooks, :release_hooks, :member_hooks, - :subgroup_hooks + :subgroup_hooks, + :feature_flag_hooks, + :confidential_note_hooks ] belongs_to :group -- GitLab From 746da7b4c5ff7c886b83337ff02403fdd182f0ea Mon Sep 17 00:00:00 2001 From: Lee Tickett Date: Thu, 2 Mar 2023 12:04:35 +0000 Subject: [PATCH 2/2] Add controller spec --- ee/spec/controllers/groups/hooks_controller_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ee/spec/controllers/groups/hooks_controller_spec.rb b/ee/spec/controllers/groups/hooks_controller_spec.rb index 73e5a59a99cedf..ad6165d5ece752 100644 --- a/ee/spec/controllers/groups/hooks_controller_spec.rb +++ b/ee/spec/controllers/groups/hooks_controller_spec.rb @@ -40,6 +40,8 @@ deployment_events: true, member_events: true, subgroup_events: true, + confidential_note_events: true, + feature_flag_events: true, # editable attributes enable_ssl_verification: true, token: 'TEST TOKEN', -- GitLab