diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
| commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
| tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /app/controllers/admin/email_domain_blocks_controller.rb | |
| parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
| parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) | |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/email_domain_blocks_controller.rb')
| -rw-r--r-- | app/controllers/admin/email_domain_blocks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb index 593457b94..a0a43de19 100644 --- a/app/controllers/admin/email_domain_blocks_controller.rb +++ b/app/controllers/admin/email_domain_blocks_controller.rb @@ -19,7 +19,7 @@ module Admin rescue ActionController::ParameterMissing flash[:alert] = I18n.t('admin.email_domain_blocks.no_email_domain_block_selected') rescue Mastodon::NotPermittedError - flash[:alert] = I18n.t('admin.custom_emojis.not_permitted') + flash[:alert] = I18n.t('admin.email_domain_blocks.not_permitted') ensure redirect_to admin_email_domain_blocks_path end |