about summary refs log tree commit diff
path: root/lib/cli.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-06-26 16:36:55 +0200
committerGitHub <noreply@github.com>2020-06-26 16:36:55 +0200
commit10ede3eb27c5de5d4e3a283e333af2a54da6177d (patch)
tree2e88bb2d667a416770a098915d8b3ea16ff9c208 /lib/cli.rb
parent8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (diff)
parentde735286cd62acd9d0fbb0dd54c82098cc3a4993 (diff)
Merge pull request #1364 from ThibG/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 313a36a3d..7cab0d5a1 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -12,6 +12,7 @@ require_relative 'mastodon/domains_cli'
 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/version'
 
 module Mastodon
@@ -53,6 +54,9 @@ module Mastodon
     desc 'upgrade SUBCOMMAND ...ARGS', 'Various version upgrade utilities'
     subcommand 'upgrade', Mastodon::UpgradeCLI
 
+    desc 'email-domain-blocks SUBCOMMAND ...ARGS', 'Manage E-mail domain blocks'
+    subcommand 'email_domain_blocks', Mastodon::EmailDomainBlocksCLI
+
     option :dry_run, type: :boolean
     desc 'self-destruct', 'Erase the server from the federation'
     long_desc <<~LONG_DESC