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

Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
2021-01-26 14:01:30 +01:00
parent d1255ab8a5 7f1c56954b
commit b81710c02c
26 changed files with 37 additions and 40 deletions
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@ -93,7 +93,7 @@ module Mastodon

      work_unit = ->(domain) do
        next if stats.key?(domain)
-        next if options[:exclude_suspended] && domain.match(blocked_domains)
+        next if options[:exclude_suspended] && domain.match?(blocked_domains)

        stats[domain] = nil