Merge branch 'regen-2fa-codes' into 'master'

Add button to regenerate 2FA codes.

Closes #48408

See merge request gitlab-org/gitlab-ce!20295
This commit is contained in:
Douwe Maan 2018-07-19 10:38:04 +00:00
commit ae55ffe084
2 changed files with 12 additions and 1 deletions

View file

@ -13,10 +13,16 @@
- if current_user.two_factor_otp_enabled?
%p
You've already enabled two-factor authentication using mobile authenticator applications. In order to register a different device, you must first disable two-factor authentication.
%p
If you lose your recovery codes you can generate new ones, invalidating all previous codes.
%div
= link_to 'Disable two-factor authentication', profile_two_factor_auth_path,
method: :delete,
data: { confirm: "Are you sure? This will invalidate your registered applications and U2F devices." },
class: 'btn btn-danger'
class: 'btn btn-danger append-right-10'
= form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f|
= submit_tag 'Regenerate recovery codes', class: 'btn'
- else
%p
Download the Google Authenticator application from App Store or Google Play Store and scan this code.

View file

@ -0,0 +1,5 @@
---
title: Added button to regenerate 2FA codes
merge_request:
author: Luke Picciau
type: added