From c06723ee715512c2033c7786c48f15674585b56b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 01:59:57 +0200 Subject: 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 --- lib/chaos_importer.rb | 4 ++-- lib/update_importer.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/chaos_importer.rb b/lib/chaos_importer.rb index db2a96b..41dca30 100644 --- a/lib/chaos_importer.rb +++ b/lib/chaos_importer.rb @@ -148,7 +148,7 @@ class ChaosImporter :body => extract_body(html) } - draft.update_attributes options + draft.update options draft end @@ -215,7 +215,7 @@ class ChaosImporter unless tmp_event = node.event tmp_event = Event.create! event_options.merge({:node_id => node.id}) else - tmp_event.update_attributes event_options + tmp_event.update event_options end end diff --git a/lib/update_importer.rb b/lib/update_importer.rb index 103ac5a..2978c43 100644 --- a/lib/update_importer.rb +++ b/lib/update_importer.rb @@ -82,7 +82,7 @@ class UpdateImporter I18n.locale = lang unless node.head - page.update_attributes( + page.update( :title => xhtml.elements['title'].get_text.to_s, :abstract => xhtml.elements['abstract'].get_text.to_s, :body => body @@ -176,7 +176,7 @@ class UpdateImporter unless tmp_event = node.event tmp_event = Event.create! event_options.merge({:node_id => node.id}) else - tmp_event.update_attributes event_options + tmp_event.update event_options end end end -- cgit v1.3