diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-06-26 01:59:57 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-06-26 01:59:57 +0200 |
| commit | c06723ee715512c2033c7786c48f15674585b56b (patch) | |
| tree | 46d074bde9a4fc61f0a76cbc601007ed4412ec61 /config/environments | |
| parent | 0818a3057b0a91e422158d828026c941b4e10622 (diff) | |
Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2
- routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility)
- RSS named routes rss_xml/rss_rdf added
- RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper
- Paperclip removed, replaced with FileAttachment concern (preserves URL scheme)
- Assets resource moved to /admin/assets (Sprockets middleware conflict)
- ApplicationRecord base class added, all models migrated
- Strong parameters added to Assets, Occurrences, Events, MenuItems controllers
- update_attributes -> update throughout
- render :nothing -> head :ok/:not_found throughout
- language_selector rewritten (removes :overwrite_params)
- Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer)
- Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper
- AssetsController tests added (10 tests covering upload, variants, destroy, auth)
- ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6)
129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 7 | ||||
| -rw-r--r-- | config/environments/production.rb | 14 | ||||
| -rw-r--r-- | config/environments/test.rb | 7 |
3 files changed, 14 insertions, 14 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 3813cab..8e2e7ef 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb | |||
| @@ -7,7 +7,6 @@ Cccms::Application.configure do | |||
| 7 | config.cache_classes = false | 7 | config.cache_classes = false |
| 8 | 8 | ||
| 9 | # Log error messages when you accidentally call methods on nil. | 9 | # Log error messages when you accidentally call methods on nil. |
| 10 | config.whiny_nils = true | ||
| 11 | 10 | ||
| 12 | # Show full error reports and disable caching | 11 | # Show full error reports and disable caching |
| 13 | config.action_controller.consider_all_requests_local = true | 12 | config.action_controller.consider_all_requests_local = true |
| @@ -17,6 +16,10 @@ Cccms::Application.configure do | |||
| 17 | config.action_mailer.raise_delivery_errors = false | 16 | config.action_mailer.raise_delivery_errors = false |
| 18 | 17 | ||
| 19 | config.active_support.deprecation = :log | 18 | config.active_support.deprecation = :log |
| 20 | config.serve_static_files = true | 19 | config.public_file_server.enabled = true |
| 21 | config.eager_load = false | 20 | config.eager_load = false |
| 21 | |||
| 22 | config.hosts.clear | ||
| 23 | |||
| 24 | config.middleware.delete ExceptionNotification::Rack | ||
| 22 | end | 25 | end |
diff --git a/config/environments/production.rb b/config/environments/production.rb index 6f2c5bd..82b918a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb | |||
| @@ -13,7 +13,7 @@ Cccms::Application.configure do | |||
| 13 | config.log_level = :info | 13 | config.log_level = :info |
| 14 | 14 | ||
| 15 | config.active_support.deprecation = :notify | 15 | config.active_support.deprecation = :notify |
| 16 | config.eager_load = false | 16 | config.eager_load = true |
| 17 | 17 | ||
| 18 | # Use a different logger for distributed setups | 18 | # Use a different logger for distributed setups |
| 19 | # config.logger = SyslogLogger.new | 19 | # config.logger = SyslogLogger.new |
| @@ -30,11 +30,11 @@ Cccms::Application.configure do | |||
| 30 | # Enable threaded mode | 30 | # Enable threaded mode |
| 31 | # config.threadsafe! | 31 | # config.threadsafe! |
| 32 | 32 | ||
| 33 | ActionMailer::Base.delivery_method = :sendmail | 33 | config.action_mailer.delivery_method = :sendmail |
| 34 | ActionMailer::Base.sendmail_settings = { | 34 | config.action_mailer.sendmail_settings = { |
| 35 | :location => '/usr/sbin/sendmail', | 35 | location: '/usr/sbin/sendmail', |
| 36 | :arguments => '-i -t' | 36 | arguments: '-i -t' |
| 37 | } | 37 | } |
| 38 | ActionMailer::Base.perform_deliveries = true | 38 | config.action_mailer.perform_deliveries = true |
| 39 | ActionMailer::Base.raise_delivery_errors = true | 39 | config.action_mailer.raise_delivery_errors = true |
| 40 | end | 40 | end |
diff --git a/config/environments/test.rb b/config/environments/test.rb index 858bebb..a23c6d4 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb | |||
| @@ -2,9 +2,6 @@ Cccms::Application.configure do | |||
| 2 | 2 | ||
| 3 | config.cache_classes = true | 3 | config.cache_classes = true |
| 4 | 4 | ||
| 5 | # Log error messages when you accidentally call methods on nil. | ||
| 6 | # config.whiny_nils = true # removed in Rails 4 | ||
| 7 | |||
| 8 | config.action_controller.consider_all_requests_local = true | 5 | config.action_controller.consider_all_requests_local = true |
| 9 | config.action_controller.perform_caching = false | 6 | config.action_controller.perform_caching = false |
| 10 | 7 | ||
| @@ -16,7 +13,7 @@ Cccms::Application.configure do | |||
| 16 | config.active_support.test_order = :sorted | 13 | config.active_support.test_order = :sorted |
| 17 | 14 | ||
| 18 | config.eager_load = false | 15 | config.eager_load = false |
| 19 | config.serve_static_files = true | 16 | config.public_file_server.enabled = true |
| 20 | config.static_cache_control = "public, max-age=3600" | 17 | config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } |
| 21 | config.assets.compile = true | 18 | config.assets.compile = true |
| 22 | end | 19 | end |
