diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-06 15:50:16 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-06 15:50:16 +0000 |
| commit | 514dc1a0848616b93e8910c6c48eea4f64391884 (patch) | |
| tree | 35a768a62655807582ca1fe238d870a0e898fddc /app/controllers/groups_controller.rb | |
| parent | fd82264391c9408d4074e2a446aa9ff45c705919 (diff) | |
| parent | 01be21d42705d8d9857a0d4e5f3146a30b40352e (diff) | |
| download | gitlab-ce-514dc1a0848616b93e8910c6c48eea4f64391884.tar.gz | |
Merge branch 'feature/enforce-2fa-per-group' into 'master'
Support 2FA requirement per-group
See merge request !8763
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 78c9f1f7004..593001e6396 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -151,7 +151,9 @@ class GroupsController < Groups::ApplicationController :visibility_level, :parent_id, :create_chat_team, - :chat_team_name + :chat_team_name, + :require_two_factor_authentication, + :two_factor_grace_period ] end |