Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-06-02 14:42:18 +0300
committerJacob Vosmaer <jacob@gitlab.com>2016-06-02 14:42:18 +0300
commitfea591e5c5796235d28eeec4d27759f87fa9d8e2 (patch)
treecdf9f9c4b6902ea48fb73e482e277a6e9e407759 /config
parent8299fc277d417278a92179fd560431785ebf532e (diff)
Rename finder to find_in_gitlab_or_ldap
Diffstat (limited to 'config')
-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 aae2ee3193d..8dc8e270afc 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_by_master_or_ldap(params[:username], params[:password])
+ Gitlab::Auth.find_in_gitlab_or_ldap(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.