summaryrefslogtreecommitdiffstats
path: root/app/lib
diff options
context:
space:
mode:
authorMatt Jankowski <matt@jankowski.online>2023-07-02 04:38:53 -0400
committerGitHub <noreply@github.com>2023-07-02 10:38:53 +0200
commit50c2a036952ffb9d036230388931a6aca3f00c45 (patch)
tree178d7bf60ee55204d5c3d3a9406ed66eaf5e8e52 /app/lib
parent4fe2d7cb59f4622ff8af2f048b883f413e87c68e (diff)
Rails 7 update (#24241)
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/inline_renderer.rb2
-rw-r--r--app/lib/rss/channel.rb2
-rw-r--r--app/lib/rss/item.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 4bb240b48b9..eda3da2c29b 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -37,7 +37,7 @@ class InlineRenderer
private
def preload_associations_for_status
- ActiveRecord::Associations::Preloader.new.preload(@object, {
+ ActiveRecord::Associations::Preloader.new(records: @object, associations: {
active_mentions: :account,
reblog: {
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
index 1dba94e47ee..9013ed066a1 100644
--- a/app/lib/rss/channel.rb
+++ b/app/lib/rss/channel.rb
@@ -16,7 +16,7 @@ class RSS::Channel < RSS::Element
end
def last_build_date(date)
- append_element('lastBuildDate', date.to_formatted_s(:rfc822))
+ append_element('lastBuildDate', date.to_fs(:rfc822))
end
def image(url, title, link)
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
index c02991ace2b..6739a2c184d 100644
--- a/app/lib/rss/item.rb
+++ b/app/lib/rss/item.rb
@@ -20,7 +20,7 @@ class RSS::Item < RSS::Element
end
def pub_date(date)
- append_element('pubDate', date.to_formatted_s(:rfc822))
+ append_element('pubDate', date.to_fs(:rfc822))
end
def description(str)