-
- Downloads
Merge branch 'feature/force-tfa' into 'master'
Require two factor authentication Allow Admins to force 2FA on their users, as discussed here: gitlab-org/gitlab-ce#3783 See merge request !2155
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/controllers/admin/application_settings_controller.rb 2 additions, 0 deletionsapp/controllers/admin/application_settings_controller.rb
- app/controllers/application_controller.rb 24 additions, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/profiles/two_factor_auths_controller.rb 24 additions, 1 deletionapp/controllers/profiles/two_factor_auths_controller.rb
- app/helpers/auth_helper.rb 12 additions, 0 deletionsapp/helpers/auth_helper.rb
- app/models/application_setting.rb 33 additions, 26 deletionsapp/models/application_setting.rb
- app/views/admin/application_settings/_form.html.haml 12 additions, 0 deletionsapp/views/admin/application_settings/_form.html.haml
- app/views/profiles/two_factor_auths/new.html.haml 1 addition, 0 deletionsapp/views/profiles/two_factor_auths/new.html.haml
- config/routes.rb 1 addition, 0 deletionsconfig/routes.rb
- db/migrate/20151218154042_add_tfa_to_application_settings.rb 8 additions, 0 deletionsdb/migrate/20151218154042_add_tfa_to_application_settings.rb
- db/migrate/20151221234414_add_tfa_additional_fields.rb 7 additions, 0 deletionsdb/migrate/20151221234414_add_tfa_additional_fields.rb
- db/schema.rb 3 additions, 0 deletionsdb/schema.rb
- doc/security/README.md 1 addition, 0 deletionsdoc/security/README.md
- doc/security/two_factor_authentication.md 38 additions, 0 deletionsdoc/security/two_factor_authentication.md
- spec/features/login_spec.rb 52 additions, 0 deletionsspec/features/login_spec.rb
- spec/models/application_setting_spec.rb 1 addition, 0 deletionsspec/models/application_setting_spec.rb
Loading
Please register or sign in to comment