diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-02-22 19:36:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 19:36:03 +0100 |
| commit | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (patch) | |
| tree | 8850793f3118de3a91e2e224bcec9651e023acd0 /app/serializers/rest/instance_serializer.rb | |
| parent | 8792128f38e19b0d7882468a4f1f9362b98793a0 (diff) | |
| parent | 6ae04d990c50c12e171fc2a3d2593fa42d9c4c9c (diff) | |
Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/instance_serializer.rb')
| -rw-r--r-- | app/serializers/rest/instance_serializer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 54e7c450c..ae8b80fb7 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -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 |