diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-18 15:03:27 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-22 23:50:55 +0100 |
| commit | f10c999bca2b5b37b068ff3680a6e35a6707828d (patch) | |
| tree | a517f86544c1544ee25d174652a003fff9b199a0 /app/controllers/concerns/authenticates_with_two_factor.rb | |
| parent | c212908aad9b32352653dfe9ca966f148c8dfc1a (diff) | |
| download | gitlab-ce-f10c999bca2b5b37b068ff3680a6e35a6707828d.tar.gz | |
Refactor OmniauthCallbacksController to remove duplication
Moves LDAP to its own controller with tests
Provides path forward for implementing GroupSaml
Diffstat (limited to 'app/controllers/concerns/authenticates_with_two_factor.rb')
| -rw-r--r-- | app/controllers/concerns/authenticates_with_two_factor.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index 2fdf346ef44..69a053d4246 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -23,6 +23,9 @@ module AuthenticatesWithTwoFactor # # Returns nil def prompt_for_two_factor(user) + # Set @user for Devise views + @user = user # rubocop:disable Gitlab/ModuleWithInstanceVariables + return locked_user_redirect(user) unless user.can?(:log_in) session[:otp_user_id] = user.id |