diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-10-12 16:17:54 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-11-02 11:39:03 +0100 |
commit | a6c462b28c920704661463b562dabbf9b8cb1b17 (patch) | |
tree | 7cdab4391fd9c623386e389c86f8e591c4242456 /app/views/profiles/accounts | |
parent | 9d6c7d9e9c3ed8ae81f6468afb76c9b11d1f3fd5 (diff) | |
download | gitlab-ce-a6c462b28c920704661463b562dabbf9b8cb1b17.tar.gz |
Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens
Diffstat (limited to 'app/views/profiles/accounts')
-rw-r--r-- | app/views/profiles/accounts/_reset_token.html.haml | 11 | ||||
-rw-r--r-- | app/views/profiles/accounts/show.html.haml | 15 |
2 files changed, 0 insertions, 26 deletions
diff --git a/app/views/profiles/accounts/_reset_token.html.haml b/app/views/profiles/accounts/_reset_token.html.haml deleted file mode 100644 index c31a4a8ecd4..00000000000 --- a/app/views/profiles/accounts/_reset_token.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -- name = label.parameterize -- attribute = name.underscore - -.reset-action - %p.cgray - = label_tag name, label, class: "label-light" - = text_field_tag name, current_user.send(attribute), class: 'form-control', readonly: true, onclick: 'this.select()' - %p.help-block - = help_text - .prepend-top-default - = link_to button_label, [:reset, attribute, :profile], method: :put, data: { confirm: 'Are you sure?' }, class: 'btn btn-default private-token' diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index f0216c64d63..ced58dffcdc 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -9,21 +9,6 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 - - number_of_tokens = incoming_email_token_enabled? ? 2 : 1 - = "Private Token".pluralize(number_of_tokens) - %p - 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: '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 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 - .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 Two-Factor Authentication %p Increase your account's security by enabling Two-Factor Authentication (2FA). |