diff options
| author | connorshea <connor.james.shea@gmail.com> | 2016-03-31 19:54:03 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-03 13:55:19 -0600 |
| commit | b898810c8d94b51514a7b5582921ab9ace4e40fb (patch) | |
| tree | 35b0ac33c4cd9722fef1e2576ebed1db3adef07b | |
| parent | a0ea38c356889f8cca26ee389f6a466b03a6e057 (diff) | |
| download | gitlab-ce-b898810c8d94b51514a7b5582921ab9ace4e40fb.tar.gz | |
Improve the Two-factor Authentication sign-in text [ci skip]
Resolves #14543.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/devise/sessions/two_factor.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 11b1768c8eb..4c68c836080 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.8.0 (unreleased) - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718 - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes) - Added multiple colors for labels in dropdowns when dups happen. + - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea) v 8.7.2 - The "New Branch" button is now loaded asynchronously diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index 22b2c1a186b..c9d1e454a5e 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -4,7 +4,7 @@ %h3 Two-factor Authentication .login-body = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f| - = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor authentication code', required: true, autofocus: true - %p.help-block.hint If you've lost your phone, you may enter one of your recovery codes. + = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true + %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes. .prepend-top-20 = f.submit "Verify code", class: "btn btn-save" |