diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/views/groups/settings/_remove.html.haml | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/views/groups/settings/_remove.html.haml')
-rw-r--r-- | app/views/groups/settings/_remove.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/groups/settings/_remove.html.haml b/app/views/groups/settings/_remove.html.haml index a617467019a..8571b93364b 100644 --- a/app/views/groups/settings/_remove.html.haml +++ b/app/views/groups/settings/_remove.html.haml @@ -1,5 +1,6 @@ +- remove_form_id = local_assigns.fetch(:remove_form_id, nil) + - if group.adjourned_deletion? - = render_if_exists 'groups/settings/adjourned_deletion', group: group + = render_if_exists 'groups/settings/adjourned_deletion', group: group, remove_form_id: remove_form_id - else - = render 'groups/settings/permanent_deletion', group: group - + = render 'groups/settings/permanent_deletion', group: group, remove_form_id: remove_form_id |