summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-07-31 13:57:21 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-07-31 13:57:21 +0200
commitac2598307d15bd833310f6c5cfadc218b7d80480 (patch)
treeedbc9f8750414dad4f43a2c88c348438c6900616 /test/web/mastodon_api/controllers/instance_controller_test.exs
parente4beff90f5670876184b2593c1b4a49f2339d048 (diff)
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff)
downloadpleroma-ac2598307d15bd833310f6c5cfadc218b7d80480.tar.gz
pleroma-ac2598307d15bd833310f6c5cfadc218b7d80480.zip
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
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" => _,