diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-31 10:44:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-31 10:44:22 +0000 |
| commit | e6dd3c527626af1c0f521792360f7c4b29bfee36 (patch) | |
| tree | 79dee0a3eb392d42478011af8e3eaa8d94c3e370 /app/controllers/application_controller.rb | |
| parent | eb8597a1b9eb575121f09b8b9904c0ad7cd489cc (diff) | |
| parent | 3b81345a730714a94b3e15f0eb91c4f1e8216a44 (diff) | |
| download | gitlab-ce-e6dd3c527626af1c0f521792360f7c4b29bfee36.tar.gz | |
Merge branch 'feature/gb/login-activity-metrics' into 'master'
Add user authentication activity metrics
Closes #47789
See merge request gitlab-org/gitlab-ce!20668
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index eeceb99c8d2..73d7b8cb9cf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -397,7 +397,7 @@ class ApplicationController < ActionController::Base # actually stored in the session and a token is needed # for every request. If you want the token to work as a # sign in token, you can simply remove store: false. - sign_in user, store: false + sign_in(user, store: false, message: :sessionless_sign_in) end end |