diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-14 15:07:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-14 15:07:51 +0000 |
| commit | bdc1a55eded1f60900fe89591a7fb935445eaac6 (patch) | |
| tree | a1046d63a6917cbcfb8e3b2e47ec016822ea2bd7 /lib | |
| parent | 8f66751179bf97d92fa0b9e85fd5336b40f990ea (diff) | |
| parent | c5e34da01d6ef4717f934754c9c2d1beadd8c55e (diff) | |
| download | gitlab-ce-bdc1a55eded1f60900fe89591a7fb935445eaac6.tar.gz | |
Merge branch '29389-fix-already-initialized-constants' into 'master'
Remove explicit `require` calls, and use `require_dependency` when needed
Closes #29389
See merge request !9899
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 2 | ||||
| -rw-r--r-- | lib/omni_auth/strategies/bitbucket.rb (renamed from lib/omniauth/strategies/bitbucket.rb) | 0 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index b84c81f1a6c..2d5e47a6f3b 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -1,5 +1,3 @@ -require 'gitlab/o_auth/user' - # LDAP extension for User model # # * Find or create user from omniauth.auth data diff --git a/lib/omniauth/strategies/bitbucket.rb b/lib/omni_auth/strategies/bitbucket.rb index 5a7d67c2390..5a7d67c2390 100644 --- a/lib/omniauth/strategies/bitbucket.rb +++ b/lib/omni_auth/strategies/bitbucket.rb |