Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 0 insertions, 20 deletions

diff --git a/app/views/admin/users/_modals.html.haml b/app/views/admin/users/_modals.html.haml
deleted file mode 100644
index 0890990f476..00000000000
--- a/app/views/admin/users/_modals.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-#js-delete-user-modal
-#js-modal-texts.hidden{ "hidden": true, "aria-hidden": "true" }
-  %div{ data: { modal: "delete",
-    title: s_("AdminUsers|Delete User %{username}?"),
-    action: s_('AdminUsers|Delete user'),
-    'secondary-action': s_('AdminUsers|Block user') } }
-    = s_('AdminUsers|You are about to permanently delete the user %{username}. Issues, merge requests,
-      and groups linked to them will be transferred to a system-wide "Ghost-user". To avoid data loss,
-      consider using the %{strongStart}block user%{strongEnd} feature instead. Once you %{strongStart}Delete user%{strongEnd},
-      it cannot be undone or recovered.')
-
-  %div{ data: { modal: "delete-with-contributions",
-    title: s_("AdminUsers|Delete User %{username} and contributions?"),
-    action: s_('AdminUsers|Delete user and contributions') ,
-    'secondary-action': s_('AdminUsers|Block user') } }
-    = s_('AdminUsers|You are about to permanently delete the user %{username}. This will delete all of the issues,
-      merge requests, and groups linked to them. To avoid data loss,
-      consider using the %{strongStart}block user%{strongEnd} feature instead. Once you %{strongStart}Delete user%{strongEnd},
-      it cannot be undone or recovered.')
-