Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-10-26 15:08:34 +00:00 · 2017-10-26 15:08:34 +00:00 · c388f66ecc
parent d3db08b69f fe11a72c0b
commit c388f66ecc
1 changed files with 1 additions and 1 deletions
--- 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