diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-06-14 05:39:11 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-14 05:39:11 +0300 |
| commit | b6a703e71546acc482ba58e1bba48f0eb747653c (patch) | |
| tree | 6439646525539562cd63adb9d6bf4e436ef10afb /config/initializers/doorkeeper.rb | |
| parent | f7467bd6b4f7f577002d8f14b41d3382d8d93d54 (diff) | |
| parent | f34af6b83cc2663bb8a076f4df9c82047e5511ab (diff) | |
Merge branch 'master' into 8-9-stable
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 8dc8e270afc..618dba74151 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.find_in_gitlab_or_ldap(params[:username], params[:password]) + Gitlab::Auth.find_with_user_password(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. |