Merge branch 'arty-spt-selfserve-del' into 'master'

Provide self-serve deletion method

See merge request gitlab-org/gitlab!52538

app/views/profiles/accounts/show.html.haml

@@ -81,9 +81,10 @@
           = s_('Profiles|You must transfer ownership or delete these groups before you can delete your account.')
       - elsif !current_user.can_remove_self?
         %p
-          = s_('Profiles|GitLab is unable to verify your identity automatically.')
+          - reset_link = reset_profile_password_path
+          = s_('Profiles|GitLab is unable to verify your identity automatically. For security purposes, you must set a password by %{openingTag}resetting your password%{closingTag} to delete your account.').html_safe % { openingTag: "<a href='#{reset_link}'>".html_safe, closingTag: '</a>'.html_safe}
         %p
-          = s_('Profiles|Please email %{data_request} to begin the account deletion process.').html_safe % { data_request: mail_to('personal-data-request@gitlab.com') }
+          = s_('Profiles|If after setting a password, the option to delete your account is still not available, please email %{data_request} to begin the account deletion process.').html_safe % { data_request: mail_to('personal-data-request@gitlab.com') }
       - else
         %p
           = s_("Profiles|You don't have access to delete this user.")

changelogs/unreleased/arty-spt-selfserve-del.yml

+---
+title: Add additional instructions on deleting account on Gitlab.com
+merge_request: 52538
+author:
+type: other

locale/gitlab.pot

@@ -21834,12 +21834,15 @@ msgstr ""
 msgid "Profiles|Full name"
 msgstr ""
 
-msgid "Profiles|GitLab is unable to verify your identity automatically."
+msgid "Profiles|GitLab is unable to verify your identity automatically. For security purposes, you must set a password by %{openingTag}resetting your password%{closingTag} to delete your account."
 msgstr ""
 
 msgid "Profiles|Give your individual key a title."
 msgstr ""
 
+msgid "Profiles|If after setting a password, the option to delete your account is still not available, please email %{data_request} to begin the account deletion process."
+msgstr ""
+
 msgid "Profiles|Include private contributions on my profile"
 msgstr ""
 
@@ -21885,9 +21888,6 @@ msgstr ""
 msgid "Profiles|Path"
 msgstr ""
 
-msgid "Profiles|Please email %{data_request} to begin the account deletion process."
-msgstr ""
-
 msgid "Profiles|Position and size your new avatar"
 msgstr ""