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

2018-01-17 16:17:10 +00:00
parent 60ff086960 fbe7756da6
commit aa2bf07281
51 changed files with 926 additions and 447 deletions
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@ -6,7 +6,8 @@ class ManifestSerializer < ActiveModel::Serializer

  attributes :name, :short_name, :description,
             :icons, :theme_color, :background_color,
-             :display, :start_url, :scope
+             :display, :start_url, :scope,
+             :share_target

  def name
    object.site_title
@ -49,4 +50,8 @@ class ManifestSerializer < ActiveModel::Serializer
  def scope
    root_url
  end
+
+  def share_target
+    { url_template: 'share?title={title}&text={text}&url={url}' }
+  end
 end