Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2021-02-22 15:23:46 +01:00
56 changed files with 761 additions and 359 deletions

View File

@@ -9,7 +9,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer
has_one :contact_account, serializer: REST::AccountSerializer
delegate :contact_account, to: :instance_presenter
has_many :rules, serializer: REST::RuleSerializer
delegate :contact_account, :rules, to: :instance_presenter
def uri
Rails.configuration.x.local_domain

View File

@@ -0,0 +1,9 @@
# frozen_string_literal: true
class REST::RuleSerializer < ActiveModel::Serializer
attributes :id, :text
def id
object.id.to_s
end
end