summaryrefslogtreecommitdiff
path: root/app/views/profiles/accounts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-03 09:28:33 +0000
committerPhil Hughes <me@iamphill.com>2016-03-11 09:51:07 +0000
commit218f3e702a19b8682219d0d8932e7b34986c00d4 (patch)
tree26a2adb9b381ce9b35499bb50f2fc6e281545218 /app/views/profiles/accounts
parentc4baf2417fec7b8a65b6cafe515f73ea1a3474f4 (diff)
downloadgitlab-ce-218f3e702a19b8682219d0d8932e7b34986c00d4.tar.gz
Moved 2fa into separate view
Diffstat (limited to 'app/views/profiles/accounts')
-rw-r--r--app/views/profiles/accounts/show.html.haml28
1 files changed, 2 insertions, 26 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index a5417655001..6efd119f260 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -40,32 +40,8 @@
%p
Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code.
More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}.
- .row.append-bottom-10
- .col-md-3
- = raw @qr_code
- .col-md-9
- .account-well
- %p.prepend-top-0.append-bottom-0
- Can't scan the code?
- %p.prepend-top-0.append-bottom-0
- To add the entry manually, provide the following details to the application on your phone.
- %p.prepend-top-0.append-bottom-0
- Account:
- = current_user.email
- %p.prepend-top-0.append-bottom-0
- Key:
- = current_user.otp_secret.scan(/.{4}/).join(' ')
- %p.two-factor-new-manual-content
- Time based: Yes
- = form_for @user, url: profile_two_factor_auth_path, method: :post do |f|
- - if flash[:error]
- .alert.alert-danger
- = flash[:error]
- .form-group
- = label_tag :pin_code, nil, class: "label-light"
- = text_field_tag :pin_code, nil, class: "form-control", required: true
- .prepend-top-default
- = submit_tag 'Enable two-factor authentication', class: 'btn btn-success'
+ .append-bottom-10
+ = link_to 'Enable two-factor authentication', new_profile_two_factor_auth_path, class: 'btn btn-success'
- else
= link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-danger',
data: { confirm: 'Are you sure?' }