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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/chaos_importer.rb | 4 | ||||
| -rw-r--r-- | lib/update_importer.rb | 4 |
2 files changed, 4 insertions, 4 deletions
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 | |||
| 148 | :body => extract_body(html) | 148 | :body => extract_body(html) |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | draft.update_attributes options | 151 | draft.update options |
| 152 | draft | 152 | draft |
| 153 | end | 153 | end |
| 154 | 154 | ||
| @@ -215,7 +215,7 @@ class ChaosImporter | |||
| 215 | unless tmp_event = node.event | 215 | unless tmp_event = node.event |
| 216 | tmp_event = Event.create! event_options.merge({:node_id => node.id}) | 216 | tmp_event = Event.create! event_options.merge({:node_id => node.id}) |
| 217 | else | 217 | else |
| 218 | tmp_event.update_attributes event_options | 218 | tmp_event.update event_options |
| 219 | end | 219 | end |
| 220 | end | 220 | end |
| 221 | 221 | ||
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 | |||
| 82 | I18n.locale = lang | 82 | I18n.locale = lang |
| 83 | 83 | ||
| 84 | unless node.head | 84 | unless node.head |
| 85 | page.update_attributes( | 85 | page.update( |
| 86 | :title => xhtml.elements['title'].get_text.to_s, | 86 | :title => xhtml.elements['title'].get_text.to_s, |
| 87 | :abstract => xhtml.elements['abstract'].get_text.to_s, | 87 | :abstract => xhtml.elements['abstract'].get_text.to_s, |
| 88 | :body => body | 88 | :body => body |
| @@ -176,7 +176,7 @@ class UpdateImporter | |||
| 176 | unless tmp_event = node.event | 176 | unless tmp_event = node.event |
| 177 | tmp_event = Event.create! event_options.merge({:node_id => node.id}) | 177 | tmp_event = Event.create! event_options.merge({:node_id => node.id}) |
| 178 | else | 178 | else |
| 179 | tmp_event.update_attributes event_options | 179 | tmp_event.update event_options |
| 180 | end | 180 | end |
| 181 | end | 181 | end |
| 182 | end | 182 | end |
