Merge commit 'a02ff33f0e' into kb-draft-5.22-lts

lib/mastodon/cli/media.rb

@@ -13,6 +13,7 @@ module Mastodon::CLI
     option :remove_headers, type: :boolean, default: false
     option :include_follows, type: :boolean, default: false
     option :concurrency, type: :numeric, default: 5, aliases: [:c]
+    option :verbose, type: :boolean, default: false, aliases: [:v]
     option :dry_run, type: :boolean, default: false
     desc 'remove', 'Remove remote media files, headers or avatars'
     long_desc <<-DESC

lib/mastodon/version.rb

@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def patch
-      10
+      11
     end
 
     def default_prerelease

lib/sanitize_ext/sanitize_config.rb

@@ -88,7 +88,7 @@ class Sanitize
     end
 
     MASTODON_STRICT ||= freeze_config(
-      elements: %w(p br span a del pre blockquote code b strong u i em ul ol li),
+      elements: %w(p br span a del s pre blockquote code b strong u i em ul ol li),
 
       attributes: {
         'a' => %w(href rel class translate),

lib/tasks/statistics.rake

@@ -9,11 +9,13 @@ namespace :mastodon do
     [
       ['App Libraries', 'app/lib'],
       %w(Presenters app/presenters),
+      %w(Policies app/policies),
+      %w(Serializers app/serializers),
       %w(Services app/services),
       %w(Validators app/validators),
       %w(Workers app/workers),
     ].each do |name, dir|
-      STATS_DIRECTORIES << [name, Rails.root.join(dir)]
+      STATS_DIRECTORIES << [name, dir]
     end
   end
 end