diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-10-13 17:05:18 -0700 |
|---|---|---|
| committer | Francisco Lopez <fjlopez@gitlab.com> | 2017-11-17 09:58:18 +0100 |
| commit | 43a682ccaa694d2a14f3d639d66708057859a628 (patch) | |
| tree | d77db36eb817035efed3fdb2ec163615bdbc9336 /app/controllers/application_controller.rb | |
| parent | d87030714a654b0dfa47aa6b38eb970731e7a04e (diff) | |
| download | gitlab-ce-43a682ccaa694d2a14f3d639d66708057859a628.tar.gz | |
Fix OAuth API and RSS rate limiting
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 42eae408fdc..cd7b2a463fd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -125,7 +125,7 @@ class ApplicationController < ActionController::Base # This filter handles private tokens, personal access tokens, and atom # requests with rss tokens def authenticate_sessionless_user! - user = Gitlab::Auth.find_sessionless_user(request) + user = Gitlab::Auth::RequestAuthenticator.new(request).find_sessionless_user sessionless_sign_in(user) if user >>>>>>> Add request throttles |