Merge remote-tracking branch 'upstream/pull/3397'

[rails.git] / config / initializers / config.rb

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index f7d5d79249eb43243caabc463273871e98bee8b6..d0f8c26fc31b7f5aef6877959006d3ea9b3c9125 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -2,7 +2,7 @@
 # Otherwise, admins might not be aware that they are now silently ignored
 # and major problems could occur
 # rubocop:disable Rails/Output, Rails/Exit
-if File.exist?(Rails.root.join("config", "application.yml"))
+if File.exist?(Rails.root.join("config/application.yml"))
   puts "The config/application.yml file is no longer supported."
   puts ""
   puts "Default settings are now found in config/settings.yml and you"
@@ -16,7 +16,7 @@ end
 # rubocop:enable Rails/Output, Rails/Exit
 
 # Allowed status values
-ALLOWED_STATUS ||= [
+ALLOWED_STATUS = [
   "online",            # online and operating normally
   "api_readonly",      # site online but API in read-only mode
   "api_offline",       # site online but API offline
@@ -77,5 +77,6 @@ Config.setup do |config|
     required(:api_timeout).filled(:int?)
     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
+    required(:storage_service).filled(:str?)
   end
 end