summaryrefslogtreecommitdiff
path: root/app/views/profiles/accounts
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-10-12 10:21:16 +0200
committerDouwe Maan <douwe@selenight.nl>2017-11-02 11:39:01 +0100
commit4b93429a4e7161460ecde6b0cf56480b03e8e600 (patch)
treecba999424a75565af0d9d8e5e5c8e5debc9d5d92 /app/views/profiles/accounts
parent3c03388ba047d073bd6585a201f6e56060676dcf (diff)
downloadgitlab-ce-4b93429a4e7161460ecde6b0cf56480b03e8e600.tar.gz
Remove Private Token from User Settings > Account
Diffstat (limited to 'app/views/profiles/accounts')
-rw-r--r--app/views/profiles/accounts/show.html.haml11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 7f79168dfb3..f0216c64d63 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -9,17 +9,16 @@
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4.prepend-top-0
- Private Tokens
+ - number_of_tokens = incoming_email_token_enabled? ? 2 : 1
+ = "Private Token".pluralize(number_of_tokens)
%p
- Keep these tokens secret, anyone with access to them can interact with
+ Keep your private tokens secret. Anyone with access to them can interact with some part of
GitLab as if they were you.
.col-lg-8.private-tokens-reset
- = render partial: 'reset_token', locals: { label: 'Private token', button_label: 'Reset private token', help_text: 'Your private token is used to access the API and Atom feeds without username/password authentication.' }
-
- = render partial: 'reset_token', locals: { label: 'RSS token', button_label: 'Reset RSS token', help_text: 'Your RSS token is used to create urls for personalized RSS feeds.' }
+ = render partial: 'reset_token', locals: { label: 'RSS token', button_label: 'Reset RSS token', help_text: 'Your RSS token is used to access your personalized RSS feeds without username/password authentication. It cannot be used to access any other data.' }
- if incoming_email_token_enabled?
- = render partial: 'reset_token', locals: { label: 'Incoming email token', button_label: 'Reset incoming email token', help_text: 'Your incoming email token is used to create new issues by email, and is included in your project-specific email addresses.' }
+ = render partial: 'reset_token', locals: { label: 'Incoming email token', button_label: 'Reset incoming email token', help_text: 'Your incoming email token is used to authenticate you when creating new issues by email, and is included in your project-specific email addresses. It cannot be used to access any other data.' }
%hr
.row.prepend-top-default