diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
| commit | 870d71b78be74b7fab4892a79a87aff39b1e2726 (patch) | |
| tree | 0628116973b67c573509f8affe50cc3d6c9a6f4f /app/serializers | |
| parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
| parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) | |
Merge branch 'master' into gs-master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/rest/custom_emoji_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb index b958e6a5d..65686a866 100644 --- a/app/serializers/rest/custom_emoji_serializer.rb +++ b/app/serializers/rest/custom_emoji_serializer.rb @@ -3,7 +3,7 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer include RoutingHelper - attributes :shortcode, :url, :static_url + attributes :shortcode, :url, :static_url, :visible_in_picker def url full_asset_url(object.image.url) |