Load danbooru_default_config.rb earlier.

Load danbooru_default_config.rb inside application.rb instead of in an
initializer so that it's available as soon as possible.
This commit is contained in:
evazion 2018-01-28 16:49:24 -06:00
parent d70a0a64bd
commit 2fd91bfa20
3 changed files with 9 additions and 11 deletions

View File

@ -6,11 +6,13 @@ if defined?(Bundler)
end
Bundler.require(*Rails.groups)
require_relative "danbooru_default_config"
require_relative "danbooru_local_config"
module Danbooru
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.1
config.active_record.schema_format = :sql
config.encoding = "utf-8"
config.filter_parameters += [:password]

View File

@ -772,4 +772,10 @@ module Danbooru
end
end
end
def config
@configuration ||= EnvironmentConfiguration.new
end
module_function :config
end

View File

@ -1,10 +0,0 @@
require "#{Rails.root}/config/danbooru_default_config"
require "#{Rails.root}/config/danbooru_local_config"
module Danbooru
def config
@configuration ||= EnvironmentConfiguration.new
end
module_function :config
end