Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

2019-08-22 21:01:28 +03:00 · 2019-08-22 21:01:28 +03:00 · 7101ba1a21
commit 7101ba1a21
parent 256ff09aa8 0e50e9e4fa
6 changed files with 15 additions and 2 deletions
--- a/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs
@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
  use Pleroma.Web.ConnCase

  import Pleroma.Factory
+  clear_config([:instance, :max_account_fields])

  describe "updating credentials" do
    test "sets user settings in a generic way", %{conn: conn} do