diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 12:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 12:08:47 +0300 |
| commit | f71f0f5307d836c4b0a7e501e4af799a536f3454 (patch) | |
| tree | 96a16aeb2ece04f78aa95e84c8fd9da973824a5d /lib/gitlab/base_doorkeeper_controller.rb | |
| parent | e83b20c4f32415ecc6c76a33d6259bfca13ec250 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/base_doorkeeper_controller.rb')
| -rw-r--r-- | lib/gitlab/base_doorkeeper_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/base_doorkeeper_controller.rb b/lib/gitlab/base_doorkeeper_controller.rb index 0f370850b5b..81b01395542 100644 --- a/lib/gitlab/base_doorkeeper_controller.rb +++ b/lib/gitlab/base_doorkeeper_controller.rb @@ -6,6 +6,9 @@ module Gitlab class BaseDoorkeeperController < ActionController::Base include Gitlab::Allowable include EnforcesTwoFactorAuthentication + include SessionsHelper + + before_action :limit_session_time, if: -> { !current_user } helper_method :can? end |