From 2fd91bfa20473e7aefaebcecbe0f0590f0a3a985 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 28 Jan 2018 16:49:24 -0600
Subject: [PATCH] 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.
---
 config/application.rb                  |  4 +++-
 config/danbooru_default_config.rb      |  6 ++++++
 config/initializers/danbooru_config.rb | 10 ----------
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 config/initializers/danbooru_config.rb

diff --git a/config/application.rb b/config/application.rb
index 92d06bc4b..c642b25b2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -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]
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 821ce89af..b04786931 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -772,4 +772,10 @@ module Danbooru
       end
     end
   end
+
+  def config
+    @configuration ||= EnvironmentConfiguration.new
+  end
+
+  module_function :config
 end
diff --git a/config/initializers/danbooru_config.rb b/config/initializers/danbooru_config.rb
deleted file mode 100644
index 78a505bae..000000000
--- a/config/initializers/danbooru_config.rb
+++ /dev/null
@@ -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