diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-29 18:58:55 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-29 18:58:55 +0200 |
| commit | b1ffc9f0fee16251899e5a2efbc78c4781ef4902 (patch) | |
| tree | e5533f2b8a6aba9a69603b040727c2ada5a938c0 /config/initializers/doorkeeper.rb | |
| parent | 9ef50db6279d722caed1ab1e4576275428e6a94f (diff) | |
| download | gitlab-ce-b1ffc9f0fee16251899e5a2efbc78c4781ef4902.tar.gz | |
Make CI/Oauth/rate limiting reusable
Diffstat (limited to 'config/initializers/doorkeeper.rb')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 66ac88e9f4a..0c694e0d37a 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -12,7 +12,7 @@ Doorkeeper.configure do end resource_owner_from_credentials do |routes| - Gitlab::Auth.new.find(params[:username], params[:password]) + Gitlab::Auth.find_by_master_or_ldap(params[:username], params[:password]) end # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below. |