Merge tag 'v2.8.2' into instance_only_statuses

2019-05-07 21:42:11 +02:00
parent a285462db6 2508370f44
commit 84c8b1e200
101 changed files with 1602 additions and 490 deletions
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -14,6 +14,8 @@ class InitialStateSerializer < ActiveModel::Serializer
      domain: Rails.configuration.x.local_domain,
      admin: object.admin&.id&.to_s,
      search_enabled: Chewy.enabled?,
+      repository: Mastodon::Version.repository,
+      source_url: Mastodon::Version.source_url,
      version: Mastodon::Version.to_s,
      invites_enabled: Setting.min_invite_role == 'user',
      mascot: instance_presenter.mascot&.file&.url,