diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-10 15:51:16 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-10 15:51:16 +0300 |
| commit | 0e896ffe4eebb8bcf04bc1327d498bb041faed56 (patch) | |
| tree | 78a0e64cba51421b5164c7479099a9b2a0c13790 /config/initializers/doorkeeper.rb | |
| parent | cfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff) | |
Improve Gitlab::Auth method names
Auth.find was a very generic name for a very specific method.
Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also
looks in Kerberos.
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. |