diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-01-31 20:34:51 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-31 20:34:51 -0500 |
| commit | 3986f4f0831e5a4d6279b59cc184c59f6f9aa24b (patch) | |
| tree | 2f4c6c5d7998624af7eedef1371ae54d5fbceb0b | |
| parent | 3a95c427fddbb0679805d7107d6bb5dfe140cbc3 (diff) | |
| download | gitlab-ce-rs-two-factor-casing.tar.gz | |
Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casing
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/profiles/two_factor_auths/new.html.haml | 2 | ||||
| -rw-r--r-- | doc/security/README.md | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG index cae3eeab54e..58efbe2db7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -91,7 +91,7 @@ v 8.4.0 - Show 'All' tab by default in the builds page - Add Open Graph and Twitter Card data to all pages - Fix API project lookups when querying with a namespace with dots (Stan Hu) - - Enable forcing Two-Factor authentication sitewide, with optional grace period + - Enable forcing Two-factor authentication sitewide, with optional grace period - Import GitHub Pull Requests into GitLab - Change single user API endpoint to return more detailed data (Michael Potthoff) - Update version check images to use SVG diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index c4fb2accdd0..b0f1a34cbec 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -105,14 +105,14 @@ = f.check_box :signin_enabled Sign-in enabled .form-group - = f.label :two_factor_authentication, 'Two-Factor authentication', class: 'control-label col-sm-2' + = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' .col-sm-10 .checkbox = f.label :require_two_factor_authentication do = f.check_box :require_two_factor_authentication - Require all users to setup Two-Factor authentication + Require all users to setup Two-factor authentication .form-group - = f.label :two_factor_authentication, 'Two-Factor grace period (hours)', class: 'control-label col-sm-2' + = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'control-label col-sm-2' .col-sm-10 = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0' .help-block Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication diff --git a/app/views/profiles/two_factor_auths/new.html.haml b/app/views/profiles/two_factor_auths/new.html.haml index 1a5b6efce35..b2830aa0834 100644 --- a/app/views/profiles/two_factor_auths/new.html.haml +++ b/app/views/profiles/two_factor_auths/new.html.haml @@ -1,6 +1,6 @@ - page_title 'Two-factor Authentication', 'Account' -%h2.page-title Two-Factor Authentication (2FA) +%h2.page-title Two-factor Authentication (2FA) %p Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code. diff --git a/doc/security/README.md b/doc/security/README.md index f34c792d005..be1abb88c3d 100644 --- a/doc/security/README.md +++ b/doc/security/README.md @@ -7,4 +7,4 @@ - [Reset your root password](reset_root_password.md) - [User File Uploads](user_file_uploads.md) - [How we manage the CRIME vulnerability](crime_vulnerability.md) -- [Enforce Two-Factor authentication](two_factor_authentication.md) +- [Enforce Two-factor authentication](two_factor_authentication.md) |