diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
| commit | 452c076a34cc11cc97f4b1c3113e86ce4367e055 (patch) | |
| tree | a503b33dc6dd181e2cf56d5965fc1eb822b4d9f9 /app/views/profiles/two_factor_auths/show.html.haml | |
| parent | 13e37a3ee5c943525a99481b855d654e97e8597c (diff) | |
| download | gitlab-ce-452c076a34cc11cc97f4b1c3113e86ce4367e055.tar.gz | |
Revert "squashed merge and fixed conflicts"
This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
Diffstat (limited to 'app/views/profiles/two_factor_auths/show.html.haml')
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 6 |
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 593be2617c1..ce76cb73c9c 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, 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. + 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. .col-lg-9 %p - if @registration_key_handles.present? |