about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-05 23:42:05 +0200
committerGitHub <noreply@github.com>2017-10-05 23:42:05 +0200
commit49cc0eb3e7d1521079e33a60216df46679082547 (patch)
treee7c7879d07d9a5a6258c14b4e2d49b8c07d5d9fa /app/controllers/api
parentb9c76e2edbc372e1b472f6ba480631b79fe24722 (diff)
Improve admin UI for custom emojis, add copy/disable/enable (#5231)
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/v1/custom_emojis_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index 4dd77fb55..f8cd64455 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -4,6 +4,6 @@ class Api::V1::CustomEmojisController < Api::BaseController
   respond_to :json
 
   def index
-    render json: CustomEmoji.local, each_serializer: REST::CustomEmojiSerializer
+    render json: CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer
   end
 end