From a6c462b28c920704661463b562dabbf9b8cb1b17 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 12 Oct 2017 16:17:54 +0200 Subject: Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens --- app/views/profiles/accounts/_reset_token.html.haml | 11 ----------- app/views/profiles/accounts/show.html.haml | 15 --------------- 2 files changed, 26 deletions(-) delete mode 100644 app/views/profiles/accounts/_reset_token.html.haml (limited to 'app/views/profiles/accounts') 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 @@ -6,21 +6,6 @@ .alert.alert-info Some options are unavailable for LDAP accounts -.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 -- cgit v1.2.1