diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-24 18:58:46 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-24 19:01:30 -0200 |
| commit | 1249289f89feba725109ce769e685b07cf746e4b (patch) | |
| tree | 6fca6541c5667a41a36b2824fe0053e14c5e74f5 /app/controllers/application_controller.rb | |
| parent | 6e3fb5024addf86d48c5723168f664d09d81a969 (diff) | |
| download | gitlab-ce-1249289f89feba725109ce769e685b07cf746e4b.tar.gz | |
Fixed codestyle and added 2FA documentationfeature/force-tfa
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a945b38e35f..d9a37a4d45f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base before_action :validate_user_service_ticket! before_action :reject_blocked! before_action :check_password_expiration - before_action :check_tfa_requirement + before_action :check_2fa_requirement before_action :ldap_security_check before_action :default_headers before_action :add_gon_variables @@ -224,7 +224,7 @@ class ApplicationController < ActionController::Base end end - def check_tfa_requirement + def check_2fa_requirement if two_factor_authentication_required? && current_user && !current_user.two_factor_enabled && !skip_two_factor? redirect_to new_profile_two_factor_auth_path end |