Merge branch '362122-edit-account-settings-content' into 'master'

Edit account settings page content

See merge request !91334

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

@@ -17,9 +17,9 @@
 .row.gl-mt-3.js-search-settings-section
   .col-lg-4.profile-settings-sidebar
     %h4.gl-mt-0
-      = s_('Profiles|Two-Factor Authentication')
+      = s_('Profiles|Two-factor authentication')
     %p
-      = s_("Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)")
+      = s_("Profiles|Increase your account's security by enabling two-factor authentication (2FA).")
   .col-lg-8
     %p
       #{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')}
@@ -35,9 +35,9 @@
   .row.gl-mt-3.js-search-settings-section
     .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0
-        = s_('Profiles|Social sign-in')
+        = s_('Profiles|Service sign-in')
       %p
-        = s_('Profiles|Activate signin with one of the following services')
+        = s_('Profiles|Connect a service for sign-in.')
     .col-lg-8
       = render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities]
     .col-lg-12

doc/integration/github.md

@@ -218,4 +218,4 @@ To fix this issue, you must activate GitHub sign-in in GitLab:
 1. On the top bar, in the top right corner, select your avatar.
 1. Select **Edit profile**.
 1. On the left sidebar, select **Account**.
-1. In the **Social sign-in** section, select **Connect to GitHub**.
+1. In the **Service sign-in** section, select **Connect to GitHub**.

doc/integration/kerberos.md

@@ -125,8 +125,8 @@ If you're not an administrator:
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
 1. On the left sidebar, select **Account**.
-1. In the **Social sign-in** section, select **Connect Kerberos SPNEGO**.
-   If you don't see a **Social sign-in** Kerberos option, follow the
+1. In the **Service sign-in** section, select **Connect Kerberos SPNEGO**.
+   If you don't see a **Service sign-in** Kerberos option, follow the
    requirements in [Enable single sign-on](#enable-single-sign-on).
 
 In either case, you should now be able to sign in to your GitLab account

doc/user/group/saml_sso/index.md

@@ -398,9 +398,7 @@ For example, to unlink the `MyOrg` account:
 1. On the top bar, in the top right corner, select your avatar.
 1. Select **Edit profile**.
 1. On the left sidebar, select **Account**.
-1. In the **Social sign-in** section, select **Disconnect** next to the connected account.
-
-![Unlink Group SAML](img/unlink_group_saml.png)
+1. In the **Service sign-in** section, select **Disconnect** next to the connected account.
 
 ## Group Sync
 

doc/user/project/import/bitbucket.md

@@ -58,7 +58,7 @@ For user contributions to be mapped, each user must complete the following befor
    If they don't match, modify the public name in the Atlassian account settings to match the
    username in the Bitbucket account settings.
 
-1. Connect your Bitbucket account in [GitLab profile social sign-in](https://gitlab.com/-/profile/account).
+1. Connect your Bitbucket account in [GitLab profile service sign-in](https://gitlab.com/-/profile/account).
 
 1. [Set your public email](../../profile/index.md#set-your-public-email).
 
@@ -97,7 +97,7 @@ If you've accidentally started the import process with the wrong account, follow
 the username in the Bitbucket account settings must match the public name in the Atlassian account
 settings. If these names match but user mapping still fails, the user may have modified their
 Bitbucket username after connecting their Bitbucket account in the
-[GitLab profile social sign-in](https://gitlab.com/-/profile/account).
+[GitLab profile service sign-in](https://gitlab.com/-/profile/account).
 
 To fix this, the user must verify that their Bitbucket external UID in the GitLab database matches their
 current Bitbucket public name, and reconnect if there's a mismatch:
@@ -106,7 +106,7 @@ current Bitbucket public name, and reconnect if there's a mismatch:
 
 1. In the API's response, the `identities` attribute contains the Bitbucket account that exists in
    the GitLab database. If the `extern_uid` doesn't match the current Bitbucket public name, the
-   user should reconnect their Bitbucket account in the [GitLab profile social sign-in](https://gitlab.com/-/profile/account).
+   user should reconnect their Bitbucket account in the [GitLab profile service sign-in](https://gitlab.com/-/profile/account).
 
 1. Following reconnection, the user should use the API again to verify that their `extern_uid` in
    the GitLab database now matches their current Bitbucket public name.

locale/gitlab.pot

@@ -29456,9 +29456,6 @@ msgstr ""
 msgid "Profiles|Account scheduled for removal."
 msgstr ""
-msgid "Profiles|Activate signin with one of the following services"
-msgstr ""
-
 msgid "Profiles|Active"
 msgstr ""
@@ -29513,6 +29510,9 @@ msgstr ""
 msgid "Profiles|Connect %{provider}"
 msgstr ""
+msgid "Profiles|Connect a service for sign-in."
+msgstr ""
+
 msgid "Profiles|Connected Accounts"
 msgstr ""
@@ -29591,7 +29591,7 @@ msgstr ""
 msgid "Profiles|Incoming email token was successfully reset"
 msgstr ""
-msgid "Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)"
+msgid "Profiles|Increase your account's security by enabling two-factor authentication (2FA)."
 msgstr ""
 msgid "Profiles|Invalid password"
@@ -29678,13 +29678,13 @@ msgstr ""
 msgid "Profiles|Select a service to sign in with."
 msgstr ""
-msgid "Profiles|Set new profile picture"
+msgid "Profiles|Service sign-in"
 msgstr ""
-msgid "Profiles|Set your local time zone."
+msgid "Profiles|Set new profile picture"
 msgstr ""
-msgid "Profiles|Social sign-in"
+msgid "Profiles|Set your local time zone."
 msgstr ""
 msgid "Profiles|Some options are unavailable for LDAP accounts"
@@ -29720,7 +29720,7 @@ msgstr ""
 msgid "Profiles|Title"
 msgstr ""
-msgid "Profiles|Two-Factor Authentication"
+msgid "Profiles|Two-factor authentication"
 msgstr ""
 msgid "Profiles|Type your %{confirmationValue} to confirm:"

spec/features/invites_spec.rb

@@ -72,7 +72,7 @@ def fill_in_welcome_form
         end
       end
 
-      context 'when invite is sent before account is created - ldap or social sign in for manual acceptance edge case' do
+      context 'when invite is sent before account is created - ldap or service sign in for manual acceptance edge case' do
         let(:user) { create(:user, email: 'user@example.com') }
 
         context 'when invite clicked and not signed in' do

spec/features/profiles/account_spec.rb

@@ -9,7 +9,7 @@
     sign_in(user)
   end
 
-  describe 'Social sign-in' do
+  describe 'Service sign-in' do
     context 'when an identity does not exist' do
       before do
         allow(Devise).to receive_messages(omniauth_configs: { google_oauth2: {} })