diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-08 17:36:29 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-08 17:36:29 -0500 |
| commit | acd927fd5918c837358222cb0e36d0e57f96be0c (patch) | |
| tree | 69247476c4e1cd835fb5183b187ac5e56b794153 | |
| parent | 3d12f07331f8031748bdd281993c490d3edfd6da (diff) | |
| download | gitlab-ce-acd927fd5918c837358222cb0e36d0e57f96be0c.tar.gz | |
Move lib/gitlab dependency to application
We use the `Gitlab.ee` and `.ee?` methods in several initializers now.
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/initializers/0_license.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index c5ef6a2c60d..edf8b3e87f9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,6 +6,7 @@ Bundler.require(:default, Rails.env) module Gitlab class Application < Rails::Application + require_dependency Rails.root.join('lib/gitlab') require_dependency Rails.root.join('lib/gitlab/redis/wrapper') require_dependency Rails.root.join('lib/gitlab/redis/cache') require_dependency Rails.root.join('lib/gitlab/redis/queues') diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index c4f9a2bc74e..0d101517c79 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -1,5 +1,3 @@ -require_dependency 'lib/gitlab' - Gitlab.ee do begin public_key_file = File.read(Rails.root.join(".license_encryption_key.pub")) |