summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 11:38:44 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 11:38:44 +0200
commit1b62b86fdd1ad98e680c534f05fb32ff6e23fca4 (patch)
treec585b79f1a646588328b2c8f4741dea700783b89 /config/initializers
parent60e0137c864e26fee0120dc4447bb95acc46ce51 (diff)
parent0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (diff)
downloadgitlab-ce-1b62b86fdd1ad98e680c534f05fb32ff6e23fca4.tar.gz
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/doorkeeper.rb2
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.