diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml index 7e38771d81d794fc67e485ada30f9b8fe3c0ce27..2714193d1d11564cce612092335ed68c3da06a11 100644 --- a/app/views/profiles/gpg_keys/index.html.haml +++ b/app/views/profiles/gpg_keys/index.html.haml @@ -22,7 +22,7 @@ = @gpg_keys.count .gl-new-card-actions = render Pajamas::ButtonComponent.new(size: :small, button_options: { class: "js-toggle-button js-toggle-content #{hide_class}" }) do - = _('Add a GPG key') + = _('Add new key') - c.with_body do .gl-new-card-add-form.gl-m-3.js-toggle-content{ class: add_form_class } %h4.gl-mt-0 diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index dffb45d30a12931a49c5b2f9019136006e4bb73a..fc849adc2b39bd86e6762345ccf4c88d00a19807 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -38,6 +38,7 @@ To create a new application for your user: 1. On the left sidebar, select your avatar. 1. Select **Edit profile**. 1. On the left sidebar, select **Applications**. +1. Select **Add new application**. 1. Enter a **Name** and **Redirect URI**. 1. Select OAuth 2 **Scopes** as defined in [Authorized Applications](#view-all-authorized-applications). 1. In the **Redirect URI**, enter the URL where users are sent after they authorize with GitLab. diff --git a/doc/user/profile/comment_templates.md b/doc/user/profile/comment_templates.md index a9db2d268fe1648060a60b061938ccc9775f643f..10b94617f8b9c5d1998135b314f0808e6f0f8df6 100644 --- a/doc/user/profile/comment_templates.md +++ b/doc/user/profile/comment_templates.md @@ -41,6 +41,7 @@ To create a comment template for future use: 1. On the left sidebar, select your avatar. 1. From the dropdown list, select **Preferences**. 1. On the left sidebar, select **Comment templates** (**{comment-lines}**). +1. Select **Add new**. 1. Provide a **Name** for your comment template. 1. Enter the **Content** of your reply. You can use any formatting you use in other GitLab text areas. diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 02653591da52a331be15013a15b3f00d628fc4db..dc6ca9945997ea65bf7b12ad018d2c1c47988eed 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -57,6 +57,7 @@ To add new email to your account: 1. On the left sidebar, select your avatar. 1. Select **Edit profile**. 1. On the left sidebar, select **Emails**. +1. Select **Add new email**. 1. In the **Email** text box, enter the new email. 1. Select **Add email address**. 1. Verify your email address with the verification email received. diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index a8231460045dfa6036ecfec077e387d4162a6b35..624a5a748519c5a08dbe62f35aedee2432157e51 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -51,6 +51,7 @@ You can create as many personal access tokens as you like. 1. On the left sidebar, select your avatar. 1. Select **Edit profile**. 1. On the left sidebar, select **Access Tokens**. +1. Select **Add new token**. 1. Enter a name and expiry date for the token. - The token expires on that date at midnight UTC. - If you do not enter an expiry date, the expiry date is automatically set to 365 days later than the current date. diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index 8d8639400bd0f991cfe33d68f01a7103b774edcf..7155823a0a6b73f5e45c7d5657d242ab31f5e47a 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -122,6 +122,7 @@ To add a GPG key to your user settings: 1. On the left sidebar, select your avatar. 1. Select **Edit profile**. 1. Select **GPG Keys** (**{key}**). +1. Select **Add new key**. 1. In **Key**, paste your _public_ key. 1. To add the key to your account, select **Add key**. GitLab shows the key's fingerprint, email address, and creation date: diff --git a/doc/user/ssh.md b/doc/user/ssh.md index d67423c6ae21b762071780c021a5ae459c272f11..56de81d3f7cd311311cd9c2867b3375101f7797f 100644 --- a/doc/user/ssh.md +++ b/doc/user/ssh.md @@ -325,6 +325,7 @@ To use SSH with GitLab, copy your public key to your GitLab account: 1. On the left sidebar, select your avatar. 1. Select **Edit profile**. 1. On the left sidebar, select **SSH Keys**. +1. Select **Add new key**. 1. In the **Key** box, paste the contents of your public key. If you manually copied the key, make sure you copy the entire key, which starts with `ssh-rsa`, `ssh-dss`, `ecdsa-sha2-nistp256`, `ecdsa-sha2-nistp384`, `ecdsa-sha2-nistp521`, diff --git a/spec/features/profiles/gpg_keys_spec.rb b/spec/features/profiles/gpg_keys_spec.rb index 3adda251e40f6f977d0ecdbe5e9241510e8fbd65..38abf9d20b0aac93887d8c696f75f345457dc3a6 100644 --- a/spec/features/profiles/gpg_keys_spec.rb +++ b/spec/features/profiles/gpg_keys_spec.rb @@ -15,7 +15,7 @@ end it 'saves the new key' do - click_button('Add a GPG key') + click_button('Add new key') fill_in('Key', with: GpgHelpers::User2.public_key) click_button('Add key') @@ -25,7 +25,7 @@ end it 'with multiple subkeys' do - click_button('Add a GPG key') + click_button('Add new key') fill_in('Key', with: GpgHelpers::User3.public_key) click_button('Add key')