about summary refs log tree commit diff
path: root/lib/cli.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-12-18 13:17:37 +0100
committerGitHub <noreply@github.com>2021-12-18 13:17:37 +0100
commit3b9a6049adf3ee6844a81622c297dd893836f79d (patch)
treefaf39c54064077baa984998a589803ecb7ecf230 /lib/cli.rb
parentfec4ed507466617ef34304b7d00d0383e8a958bb (diff)
parente061ea5f71109edbbf7869265f443448cace4f60 (diff)
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/cli.rb')
-rw-r--r--lib/cli.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/cli.rb b/lib/cli.rb
index 8815e137a..35c00e736 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -13,6 +13,7 @@ require_relative 'mastodon/preview_cards_cli'
 require_relative 'mastodon/cache_cli'
 require_relative 'mastodon/upgrade_cli'
 require_relative 'mastodon/email_domain_blocks_cli'
+require_relative 'mastodon/canonical_email_blocks_cli'
 require_relative 'mastodon/ip_blocks_cli'
 require_relative 'mastodon/maintenance_cli'
 require_relative 'mastodon/version'
@@ -62,6 +63,9 @@ module Mastodon
     desc 'ip_blocks SUBCOMMAND ...ARGS', 'Manage IP blocks'
     subcommand 'ip_blocks', Mastodon::IpBlocksCLI
 
+    desc 'canonical_email_blocks SUBCOMMAND ...ARGS', 'Manage canonical e-mail blocks'
+    subcommand 'canonical_email_blocks', Mastodon::CanonicalEmailBlocksCLI
+
     desc 'maintenance SUBCOMMAND ...ARGS', 'Various maintenance utilities'
     subcommand 'maintenance', Mastodon::MaintenanceCLI