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

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

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index b74ba57e635340cb82c9335abbe0de89f5f6df41..e51281e11e034499b26e9ccba6b2bb795ee3456d 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -16,7 +16,7 @@ end
 # rubocop:enable Rails/Output, Rails/Exit
 
 # Allowed status values
 # 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
   "online",            # online and operating normally
   "api_readonly",      # site online but API in read-only mode
   "api_offline",       # site online but API offline


@@ -74,9 +74,13 @@ Config.setup do |config|
     required(:max_note_request_area).filled(:number?)
     required(:tracepoints_per_page).filled(:int?)
     required(:max_number_of_way_nodes).filled(:int?)
     required(:max_note_request_area).filled(:number?)
     required(:tracepoints_per_page).filled(:int?)
     required(:max_number_of_way_nodes).filled(:int?)

+    required(:max_number_of_relation_members).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)

-    required(:storage_service).filled(:str?)
+    required(:avatar_storage).filled(:str?)
+    required(:trace_file_storage).filled(:str?)
+    required(:trace_image_storage).filled(:str?)
+    required(:trace_icon_storage).filled(:str?)

   end
 end
   end
 end