summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/user.rb2
-rw-r--r--lib/gitlab/o_auth/auth_hash.rb (renamed from lib/gitlab/oauth/auth_hash.rb)0
-rw-r--r--lib/gitlab/o_auth/user.rb (renamed from lib/gitlab/oauth/user.rb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index cfa8692659d..b04f5b4ac37 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -1,4 +1,4 @@
-require 'gitlab/oauth/user'
+require 'gitlab/o_auth/user'
# LDAP extension for User model
#
diff --git a/lib/gitlab/oauth/auth_hash.rb b/lib/gitlab/o_auth/auth_hash.rb
index ce52beec78e..ce52beec78e 100644
--- a/lib/gitlab/oauth/auth_hash.rb
+++ b/lib/gitlab/o_auth/auth_hash.rb
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/o_auth/user.rb
index 2f5c217d764..2f5c217d764 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/o_auth/user.rb