diff options
| author | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
| commit | 73f4af117fc5b5e4ee3337d634f5e589a9353644 (patch) | |
| tree | 62b0443573ba5038fd45aa14d4243dfc832c060a /app/controllers/api/v1/custom_emojis_controller.rb | |
| parent | 849e2bc4ca11892e701835a4696904d78b1ad325 (diff) | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/custom_emojis_controller.rb | 2 |
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 252f667dd..4e6d5d7c6 100644 --- a/app/controllers/api/v1/custom_emojis_controller.rb +++ b/app/controllers/api/v1/custom_emojis_controller.rb @@ -7,6 +7,6 @@ class Api::V1::CustomEmojisController < Api::BaseController def index expires_in 3.minutes, public: true - render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.local.where(disabled: false).includes(:category) } + render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) } end end |