diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-10 22:56:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 22:56:36 +0100 |
| commit | dc02a93d04815c618dc55748fff3cfe64c7023d9 (patch) | |
| tree | 5b6d56d248379823660d70dc35c95e4c547f43ea /app/serializers/rest/instance_serializer.rb | |
| parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
| parent | 87419f9307f54755af4604876ac149262ae3f0a6 (diff) | |
Merge pull request #2105 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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 24a1c1ae6..c97db9c5f 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -45,6 +45,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer { urls: { streaming: Rails.configuration.x.streaming_api_base_url, + status: object.status_page_url, }, accounts: { @@ -97,8 +98,6 @@ class REST::InstanceSerializer < ActiveModel::Serializer def registrations_message if Setting.closed_registrations_message.present? markdown.render(Setting.closed_registrations_message) - else - nil end end |