Merge branch 'oauth_token_with_ldap' into 'master'

Retrieving oauth token with LDAP credentials

https://dev.gitlab.org/gitlab/gitlabhq/issues/2529

See merge request !1220

CHANGELOG

@@ -27,6 +27,7 @@ v 8.0.0 (unreleased)
   - Make all profiles public
   - Fixed login failure when extern_uid changes (Joel Koglin)
   - Don't notify users without access to the project when they are (accidentally) mentioned in a note.
+  - Retrieving oauth token with LDAP credentials
 v 7.14.1
   - Improve abuse reports management from admin area

config/initializers/doorkeeper.rb

@@ -12,8 +12,7 @@ Doorkeeper.configure do
   end
   resource_owner_from_credentials do |routes|
-    u = User.find_by(email: params[:username]) || User.find_by(username: params[:username])
-    u if u && u.valid_password?(params[:password])
+    Gitlab::Auth.new.find(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.