Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-10 13:37:05 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-06-15 05:46:11 +0300
commitfbb06125938a6c4dd1a046b6d08ad37040f62672 (patch)
tree586e702449ecfe7c48476d21dc56d26d00ab71c2 /app/views/profiles/two_factor_auths/show.html.haml
parentf34af6b83cc2663bb8a076f4df9c82047e5511ab (diff)
Don't allow clicking on "Setup New U2F Device" unless an authenticator app has been set up.
- Also change the help message to indicate that an authenticator app is now a prerequisite for U2F.
Diffstat (limited to 'app/views/profiles/two_factor_auths/show.html.haml')
-rw-r--r--app/views/profiles/two_factor_auths/show.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index ce76cb73c9c..593be2617c1 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -51,9 +51,9 @@
%p
Use a hardware device to add the second factor of authentication.
%p
- As U2F devices are only supported by a few browsers, it's recommended that you set up a
- two-factor authentication app as well as a U2F device so you'll always be able to log in
- using an unsupported browser.
+ As U2F devices are only supported by a few browsers, we require that you set up a
+ two-factor authentication app before a U2F device. That way you'll always be able to
+ log in - even when you're using an unsupported browser.
.col-lg-9
%p
- if @registration_key_handles.present?