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

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

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index 7fc48863567b022fe8ac31d726b9ca47e811d9f9..c1cc522a5e13b24eef5b2bae373c512d403b82f6 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -16,14 +16,16 @@ end
 # rubocop:enable Rails/Output, Rails/Exit
 
 # Allowed status values
 # rubocop:enable Rails/Output, Rails/Exit
 
 # Allowed status values

-ALLOWED_STATUS = [
-  "online",            # online and operating normally
-  "api_readonly",      # site online but API in read-only mode
-  "api_offline",       # site online but API offline
-  "database_readonly", # database and site in read-only mode
-  "database_offline",  # database offline with site in emergency mode
-  "gpx_offline"        # gpx storage offline
-].freeze
+unless Object.const_defined?(: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
+    "database_readonly", # database and site in read-only mode
+    "database_offline",  # database offline with site in emergency mode
+    "gpx_offline"        # gpx storage offline
+  ].freeze
+end

 
 Config.setup do |config|
   # Name of the constant exposing loaded settings
 
 Config.setup do |config|
   # Name of the constant exposing loaded settings


@@ -75,6 +77,7 @@ Config.setup do |config|
     required(:tracepoints_per_page).filled(:int?)
     required(:max_number_of_way_nodes).filled(:int?)
     required(:max_number_of_relation_members).filled(:int?)
     required(:tracepoints_per_page).filled(:int?)
     required(:max_number_of_way_nodes).filled(:int?)
     required(:max_number_of_relation_members).filled(:int?)

+    required(:max_issues_count).filled(:int?)

     required(:api_timeout).filled(:int?)
     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
     required(:api_timeout).filled(:int?)
     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)