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
Kazuhiko Shiozaki
gitlab-ce
Commits
cde06999
Commit
cde06999
authored
Dec 24, 2015
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add to application_settings forced TFA options
parent
b61a5bc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+2
-0
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+12
-0
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
cde06999
...
@@ -49,6 +49,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -49,6 +49,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:default_branch_protection
,
:default_branch_protection
,
:signup_enabled
,
:signup_enabled
,
:signin_enabled
,
:signin_enabled
,
:require_two_factor_authentication
,
:two_factor_grace_period
,
:gravatar_enabled
,
:gravatar_enabled
,
:twitter_sharing_enabled
,
:twitter_sharing_enabled
,
:sign_in_text
,
:sign_in_text
,
...
...
app/views/admin/application_settings/_form.html.haml
View file @
cde06999
...
@@ -104,6 +104,18 @@
...
@@ -104,6 +104,18 @@
=
f
.
label
:signin_enabled
do
=
f
.
label
:signin_enabled
do
=
f
.
check_box
:signin_enabled
=
f
.
check_box
:signin_enabled
Sign-in enabled
Sign-in enabled
.form-group
=
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
.form-group
=
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
.form-group
.form-group
=
f
.
label
:restricted_signup_domains
,
'Restricted domains for sign-ups'
,
class:
'control-label col-sm-2'
=
f
.
label
:restricted_signup_domains
,
'Restricted domains for sign-ups'
,
class:
'control-label col-sm-2'
.col-sm-10
.col-sm-10
...
...
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