diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-20 19:20:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 19:20:40 +0100 |
| commit | a8c109baca4d02cc8aed454e231518c1f8ec1844 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /app/controllers/admin/custom_emojis_controller.rb | |
| parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
| parent | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (diff) | |
Merge pull request #1264 from ThibG/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, 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 |