diff options
| author | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
| commit | 5668836f56cddf3257f38a2483c1d42cacbad3a8 (patch) | |
| tree | c241a44562f79ccecaf215eb572c22d559b08dd1 /app/controllers/admin | |
| parent | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (diff) | |
| parent | c7da2cc5a1821e589e7241aec21d8bb426722c2a (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index efa8f2950..71efb543e 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -33,6 +33,8 @@ module Admin @form.save rescue ActionController::ParameterMissing flash[:alert] = I18n.t('admin.accounts.no_account_selected') + rescue Mastodon::NotPermittedError + flash[:alert] = I18n.t('admin.custom_emojis.not_permitted') ensure redirect_to admin_custom_emojis_path(filter_params) end |