diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-20 15:55:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 15:55:03 +0100 |
| commit | 6feafb8802b2759eb33968a70b6c1cb100bf3926 (patch) | |
| tree | 5df6ee7f77b92dec9ab6e848ec663b9f4b5838c4 /app/controllers/admin/custom_emojis_controller.rb | |
| parent | 06f6995860d507ac26f23722506420b5cdae2ffe (diff) | |
Various fixes and improvements (#12878)
* Fix unused role routes being generated * Remove unused JavaScript code * Refactor filters code to be DRYer * Fix `.count == 0` comparisons to `.empty?` in views * Fix filters in views
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index a446465c9..efa8f2950 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -48,7 +48,7 @@ module Admin end def filter_params - params.slice(:local, :remote, :by_domain, :shortcode, :page).permit(:local, :remote, :by_domain, :shortcode, :page) + params.slice(:page, *CustomEmojiFilter::KEYS).permit(:page, *CustomEmojiFilter::KEYS) end def action_from_button |