From 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Nov 2021 13:16:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-5-stable-ee --- app/views/groups/settings/_advanced.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views/groups/settings/_advanced.html.haml') diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml index cdff533e3c7..a82f7803b44 100644 --- a/app/views/groups/settings/_advanced.html.haml +++ b/app/views/groups/settings/_advanced.html.haml @@ -1,3 +1,4 @@ +- remove_form_id = 'js-remove-group-form' = render 'groups/settings/export', group: @group .sub-section @@ -26,6 +27,6 @@ = f.submit s_('GroupSettings|Change group URL'), class: 'btn gl-button btn-warning' = render 'groups/settings/transfer', group: @group -= render 'groups/settings/remove', group: @group += render 'groups/settings/remove', group: @group, remove_form_id: remove_form_id = render_if_exists 'groups/settings/restore', group: @group -= render_if_exists 'groups/settings/immediately_remove', group: @group += render_if_exists 'groups/settings/immediately_remove', group: @group, remove_form_id: remove_form_id -- cgit v1.2.1