diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-10-26 15:08:34 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-10-26 15:08:34 +0000 |
| commit | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (patch) | |
| tree | 74d52454f83b49a76cdab61090c4a0c6d26edf0c /app | |
| parent | dd28b94cf0ed1ed3b2d75fddb27fc4373298d659 (diff) | |
| parent | 22da775a8546a0496b4f501f7cb6e321b0168f40 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app')
| -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 5cce5bce4..5d9144be7 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -36,7 +36,7 @@ module Admin flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg') end - redirect_to admin_custom_emojis_path(params[:page]) + redirect_to admin_custom_emojis_path(page: params[:page]) end def enable |