summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-29 14:42:09 +0200
committerlain <lain@soykaf.club>2020-07-29 14:42:09 +0200
commitd9bf2c58df0a828901ab7cc66c5fd35d58a485ec (patch)
treeca5a82c8397de657c29084c183a71f1f5bb7b704 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentc25c21dd22202fe0fc827ef57e5a69631fa35bf7 (diff)
parent269b61a2402e3d12d09baf26ba73359776f556b0 (diff)
downloadpleroma-d9bf2c58df0a828901ab7cc66c5fd35d58a485ec.tar.gz
pleroma-d9bf2c58df0a828901ab7cc66c5fd35d58a485ec.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
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" => _,