Commit d2361b58 authored by Robert Speicher's avatar Robert Speicher

Move lib/gitlab dependency to application

We use the `Gitlab.ee` and `.ee?` methods in several initializers now.
parent 4162faa0
...@@ -6,6 +6,7 @@ Bundler.require(:default, Rails.env) ...@@ -6,6 +6,7 @@ Bundler.require(:default, Rails.env)
module Gitlab module Gitlab
class Application < Rails::Application 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/wrapper')
require_dependency Rails.root.join('lib/gitlab/redis/cache') require_dependency Rails.root.join('lib/gitlab/redis/cache')
require_dependency Rails.root.join('lib/gitlab/redis/queues') require_dependency Rails.root.join('lib/gitlab/redis/queues')
......
require_dependency 'lib/gitlab'
Gitlab.ee do Gitlab.ee do
begin begin
public_key_file = File.read(Rails.root.join(".license_encryption_key.pub")) public_key_file = File.read(Rails.root.join(".license_encryption_key.pub"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment