diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-13 18:05:53 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-13 18:05:53 +0000 |
| commit | 1cbd5c66866cbc8221c2ee401fe52633143355ae (patch) | |
| tree | e42fd4573c39b9243a591dd9a1b695c2f917c656 /config | |
| parent | 04e4077673634ef14b75bd7e4ff712262c0b60c2 (diff) | |
| parent | f73cf3e937b92d29753e468dac8a17470253c791 (diff) | |
| download | gitlab-ce-1cbd5c66866cbc8221c2ee401fe52633143355ae.tar.gz | |
Merge branch 'gitlab-auth-method-names' into 'master'
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.
See merge request !4589
Diffstat (limited to 'config')
| -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. |