From 3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:44:02 +0200 Subject: [PATCH] Update dependency rubocop-rails to v2.20.1 (#25493) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput --- Gemfile.lock | 2 +- app/serializers/web/notification_serializer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7cd102c5a..87d8ef7d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -616,7 +616,7 @@ GEM rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.19.1) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb index c5a908b19..fb2f7248a 100644 --- a/app/serializers/web/notification_serializer.rb +++ b/app/serializers/web/notification_serializer.rb @@ -33,7 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer end def body - str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note) + str = strip_tags(object.target_status&.spoiler_text.presence || object.target_status&.text || object.from_account.note) truncate(HTMLEntities.new.decode(str.to_str), length: 140, escape: false) # Do not encode entities, since this value will not be used in HTML end end