Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
--- 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)