Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3986f4f0
Commit
3986f4f0
authored
Jan 31, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make "Two-factor" casing consistent throughout the application
parent
3a95c427
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
CHANGELOG
CHANGELOG
+1
-1
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+3
-3
app/views/profiles/two_factor_auths/new.html.haml
app/views/profiles/two_factor_auths/new.html.haml
+1
-1
doc/security/README.md
doc/security/README.md
+1
-1
No files found.
CHANGELOG
View file @
3986f4f0
...
...
@@ -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-
F
actor authentication sitewide, with optional grace period
- Enable forcing Two-
f
actor 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
...
...
app/views/admin/application_settings/_form.html.haml
View file @
3986f4f0
...
...
@@ -105,14 +105,14 @@
=
f
.
check_box
:signin_enabled
Sign-in enabled
.form-group
=
f
.
label
:two_factor_authentication
,
'Two-
F
actor authentication'
,
class:
'control-label col-sm-2'
=
f
.
label
:two_factor_authentication
,
'Two-
f
actor 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-
F
actor authentication
Require all users to setup Two-
f
actor authentication
.form-group
=
f
.
label
:two_factor_authentication
,
'Two-
F
actor grace period (hours)'
,
class:
'control-label col-sm-2'
=
f
.
label
:two_factor_authentication
,
'Two-
f
actor 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
...
...
app/views/profiles/two_factor_auths/new.html.haml
View file @
3986f4f0
-
page_title
'Two-factor Authentication'
,
'Account'
%h2
.page-title
Two-
F
actor Authentication (2FA)
%h2
.page-title
Two-
f
actor Authentication (2FA)
%p
Download the Google Authenticator application from App Store for iOS or Google
Play for Android and scan this code.
...
...
doc/security/README.md
View file @
3986f4f0
...
...
@@ -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-
F
actor authentication
](
two_factor_authentication.md
)
-
[
Enforce Two-
f
actor authentication
](
two_factor_authentication.md
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment