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:
@@ -6,11 +6,13 @@ if defined?(Bundler)
|
|||||||
end
|
end
|
||||||
Bundler.require(*Rails.groups)
|
Bundler.require(*Rails.groups)
|
||||||
|
|
||||||
|
require_relative "danbooru_default_config"
|
||||||
|
require_relative "danbooru_local_config"
|
||||||
|
|
||||||
module Danbooru
|
module Danbooru
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
# Initialize configuration defaults for originally generated Rails version.
|
# Initialize configuration defaults for originally generated Rails version.
|
||||||
config.load_defaults 5.1
|
config.load_defaults 5.1
|
||||||
|
|
||||||
config.active_record.schema_format = :sql
|
config.active_record.schema_format = :sql
|
||||||
config.encoding = "utf-8"
|
config.encoding = "utf-8"
|
||||||
config.filter_parameters += [:password]
|
config.filter_parameters += [:password]
|
||||||
|
|||||||
@@ -772,4 +772,10 @@ module Danbooru
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def config
|
||||||
|
@configuration ||= EnvironmentConfiguration.new
|
||||||
|
end
|
||||||
|
|
||||||
|
module_function :config
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user