diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-06-25 04:34:24 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-06-25 04:34:24 +0200 |
| commit | 3f236c7a0e544db94ef822f120d649ac5ee958f7 (patch) | |
| tree | 37c91c623f880cb75ba7dd63ee6a42eb0136e2a9 /config/environments | |
| parent | 75670df5b8a5700c48ac8cb41f8d1732b5738402 (diff) | |
Upgrade to Rails 4.2.11.3
- Bump rails 3.2.22.5 → 4.2.11.3
- Replace globalize3 with globalize ~> 5.0 (gem renamed at 5.0)
- Upgrade routing-filter ~> 0.3 → ~> 0.6
- Upgrade sass-rails, coffee-rails to 4.x
- Upgrade awesome_nested_set 2.x → 3.x (Rails 4 required)
- Add jquery-rails for UJS support
- Pin nokogiri ~> 1.10.10, loofah ~> 2.20.0, rails-html-sanitizer ~> 1.4.4
- Add config/secrets.yml (gitignored), eager_load, serve_static_files
- Fix routes: add via: to all match calls, remove legacy catch-all routes
- Add admin named route, fix rvm dotfiles
- Fix ActiveRecord::FixtureSet rename in test_helper
- Set active_support.test_order and active_record.raise_in_transactional_callbacks
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/environments/production.rb | 1 | ||||
| -rw-r--r-- | config/environments/test.rb | 25 |
3 files changed, 11 insertions, 18 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 94f216f..3813cab 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb | |||
| @@ -17,5 +17,6 @@ Cccms::Application.configure do | |||
| 17 | config.action_mailer.raise_delivery_errors = false | 17 | config.action_mailer.raise_delivery_errors = false |
| 18 | 18 | ||
| 19 | config.active_support.deprecation = :log | 19 | config.active_support.deprecation = :log |
| 20 | config.serve_static_assets = true | 20 | config.serve_static_files = true |
| 21 | config.eager_load = false | ||
| 21 | end | 22 | end |
diff --git a/config/environments/production.rb b/config/environments/production.rb index 2f933de..6f2c5bd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb | |||
| @@ -13,6 +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 | 17 | ||
| 17 | # Use a different logger for distributed setups | 18 | # Use a different logger for distributed setups |
| 18 | # config.logger = SyslogLogger.new | 19 | # config.logger = SyslogLogger.new |
diff --git a/config/environments/test.rb b/config/environments/test.rb index 728e147..3b2413e 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb | |||
| @@ -1,32 +1,23 @@ | |||
| 1 | # Settings specified here will take precedence over those in config/environment.rb | ||
| 2 | |||
| 3 | Cccms::Application.configure do | 1 | Cccms::Application.configure do |
| 4 | 2 | ||
| 5 | # The test environment is used exclusively to run your application's | ||
| 6 | # test suite. You never need to work with it otherwise. Remember that | ||
| 7 | # your test database is "scratch space" for the test suite and is wiped | ||
| 8 | # and recreated between test runs. Don't rely on the data there! | ||
| 9 | config.cache_classes = true | 3 | config.cache_classes = true |
| 10 | 4 | ||
| 11 | # Log error messages when you accidentally call methods on nil. | 5 | # Log error messages when you accidentally call methods on nil. |
| 12 | config.whiny_nils = true | 6 | # config.whiny_nils = true # removed in Rails 4 |
| 13 | 7 | ||
| 14 | # Show full error reports and disable caching | ||
| 15 | config.action_controller.consider_all_requests_local = true | 8 | config.action_controller.consider_all_requests_local = true |
| 16 | config.action_controller.perform_caching = false | 9 | config.action_controller.perform_caching = false |
| 17 | 10 | ||
| 18 | # Disable request forgery protection in test environment | ||
| 19 | config.action_controller.allow_forgery_protection = false | 11 | config.action_controller.allow_forgery_protection = false |
| 20 | 12 | ||
| 21 | # Tell Action Mailer not to deliver emails to the real world. | ||
| 22 | # The :test delivery method accumulates sent emails in the | ||
| 23 | # ActionMailer::Base.deliveries array. | ||
| 24 | config.action_mailer.delivery_method = :test | 13 | config.action_mailer.delivery_method = :test |
| 25 | 14 | ||
| 26 | # Use SQL instead of Active Record's schema dumper when creating the test database. | 15 | config.active_support.deprecation = :log |
| 27 | # This is necessary if your schema can't be completely dumped by the schema dumper, | 16 | config.active_support.test_order = :sorted |
| 28 | # like if you have constraints or database-specific column types | 17 | |
| 29 | # config.active_record.schema_format = :sql | 18 | config.active_record.raise_in_transactional_callbacks = true |
| 30 | 19 | ||
| 31 | config.active_support.deprecation = :raise | 20 | config.eager_load = false |
| 21 | config.serve_static_files = true | ||
| 22 | config.static_cache_control = "public, max-age=3600" | ||
| 32 | end | 23 | end |
