Merge branch 'master' into feature/donations_btcpay

config/environments/test.rb

@@ -52,10 +52,9 @@ Rails.application.configure do
 
   config.active_job.queue_adapter = :test
 
-  if ENV["S3_ENABLED"]
+  if ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
     config.active_storage.service = :s3
   else
-    # Store attachments on the local disk (in ./tmp)
-    config.active_storage.service = :test
+    config.active_storage.service = :local
   end
 end

config/routes.rb

@@ -97,8 +97,8 @@ Rails.application.routes.draw do
     end
 
     namespace :settings do
-      resources 'registrations', only: ['index', 'create']
-      resources 'services', only: ['index', 'create']
+      resource 'registrations', only: ['show', 'update']
+      resources 'services', param: 'service', only: ['index', 'show', 'update']
     end
   end