Merge branch 'master' into glitch-soc/merge-upstream

2020-04-17 20:16:24 +02:00
parent 5fdd5eef5a 89077fb657
commit 81e49ba5c6
20 changed files with 139 additions and 54 deletions
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -47,7 +47,7 @@ module Admin::ActionLogsHelper
        I18n.t('admin.action_logs.deleted_status')
      end
    when 'Announcement'
-      truncate(attributes['text'])
+      truncate(attributes['text'].is_a?(Array) ? attributes['text'].last : attributes['text'])
    end
  end
 end