summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-29 16:24:22 +0200
committerlain <lain@soykaf.club>2020-07-29 16:24:22 +0200
commitdc36d6e9d21dc47fa9b6332c6444a055f789fabd (patch)
treed24ffb684053b9042339396eeb8bc02368ed6602 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentf715bf1915b75cb3c5b24d4661a94885aaa1a0ac (diff)
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff)
downloadpleroma-dc36d6e9d21dc47fa9b6332c6444a055f789fabd.tar.gz
pleroma-dc36d6e9d21dc47fa9b6332c6444a055f789fabd.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/instance_controller_test.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/mastodon_api/controllers/instance_controller_test.exs b/test/web/mastodon_api/controllers/instance_controller_test.exs
index cc880d82c..6a9ccd979 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -27,6 +27,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"thumbnail" => _,
"languages" => _,
"registrations" => _,
+ "approval_required" => _,
"poll_limits" => _,
"upload_limit" => _,
"avatar_upload_limit" => _,