diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 23:10:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 23:10:31 +0200 |
| commit | ab1488a6ad93f572e1d184cb9653f76fd408474f (patch) | |
| tree | f1dd126f4745eb99243f390169fb957a72f5acc6 /app/controllers/admin/custom_emojis_controller.rb | |
| parent | 325ebb76b19bd20e1b76d8bc26c11cab02f6571c (diff) | |
| parent | 6c0d73a675d62f676b005c06593fd69e9a7bc0e5 (diff) | |
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -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 47138bf6c..1fae60f5b 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -29,6 +29,8 @@ module Admin end def batch + authorize :custom_emoji, :index? + @form = Form::CustomEmojiBatch.new(form_custom_emoji_batch_params.merge(current_account: current_account, action: action_from_button)) @form.save rescue ActionController::ParameterMissing |