summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-09 13:36:05 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-09 14:19:24 -0400
commit2cefdbb535a2883f514e1b3482eefbe072976be3 (patch)
tree7e3be0e6ee481f26fb9aaf88f3f6087ed44a864f /lib
parenta3601d6005ff4a5f109444e7ab5333d0c229d3ed (diff)
downloadgitlab-ce-2cefdbb535a2883f514e1b3482eefbe072976be3.tar.gz
Move lib/gitlab/oauth to lib/gitlab/o_auth
Lets Rails autoload these files by name
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