diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
commit | 82236a37039043d134efb3ddbdd2a3e04e714e2c (patch) | |
tree | c00cd712a172ac3d5865e94bc505590fa211ecd5 /app/controllers/admin/custom_emojis_controller.rb | |
parent | 65d083338debc256360fd6052ec43b98c442320c (diff) | |
parent | 72314d26aeef0b225401d3f0ad97ea948c66f423 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
-rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 3fa2a0b72..ccab03de4 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -92,7 +92,9 @@ module Admin def filter_params params.permit( :local, - :remote + :remote, + :by_domain, + :shortcode ) end end |