diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-19 12:45:20 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-19 12:45:20 +0300 |
| commit | 1f7c072e08913dda0534bc5534a50f389567433f (patch) | |
| tree | 61fb05c39ccc3bf3c44f53432e77d0e41cfd808c /app | |
| parent | 22f658e039711249bf1023b85d006ea4f869c400 (diff) | |
| parent | a3bbb2074a033163ebf6cfcf9d53cd2f129c1f56 (diff) | |
Merge branch 'issue-55534' into 'master'
Close #55534: link OTP auth less strictly to Google
Closes #55534
See merge request gitlab-org/gitlab-ce!23921
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 94ec0cc5db8..d986c566928 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -25,7 +25,8 @@ - else %p - Download the Google Authenticator application from App Store or Google Play Store and scan this code. + Install a soft token authenticator like <a href="https://freeotp.github.io/">FreeOTP</a> + or Google Authenticator from your application repository and scan this QR code. More information is available in the #{link_to('documentation', help_page_path('user/profile/account/two_factor_authentication'))}. .row.append-bottom-10 .col-md-4 |