diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 519660063..12bac89f5 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -296,8 +296,9 @@ class ComposeForm extends ImmutablePureComponent {
-
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index c21c55a22..81ae74677 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -9,12 +9,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper
- attributes :uri, :title, :short_description, :description, :email,
- :version, :urls, :stats, :thumbnail,
- :languages, :registrations, :max_toot_chars, :approval_required, :invites_enabled,
- :configuration
-
- has_one :contact_account, serializer: REST::AccountSerializer
+ attributes :domain, :title, :version, :source_url, :description,
+ :usage, :thumbnail, :languages, :configuration,
+ :registrations, :max_toot_chars
has_one :contact, serializer: ContactSerializer
has_many :rules, serializer: REST::RuleSerializer
diff --git a/docker-compose.yml b/docker-compose.yml
index e3558fe03..428d4b67a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
image: ghcr.io/mastodon/mastodon:v4.2.0
restart: always
env_file: .env.production
- command: bash -c "rm -f /mastodon/tmp/pids/server.pid && bundle exec rake assets:precompile && bundle exec rails s -p 3000"
+ command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
networks:
- mastodon
- nginx
@@ -94,7 +94,7 @@ services:
- nginx
healthcheck:
# prettier-ignore
- test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:5000/api/v1/streaming/health || exit 1']
+ test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
ports:
- '127.0.0.1:5000:5000'
depends_on: