diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:15:33 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:22:56 +0300 |
commit | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (patch) | |
tree | 62083f08fbe99cd38002d1f6896cd2fd79675320 /test/web/oauth/oauth_controller_test.exs | |
parent | 28701c08ad9219219a32f31b2ed9dcb83f92cd59 (diff) | |
parent | 035c2c1415ed46abb268cf85c141384416a799e2 (diff) | |
download | pleroma-10f452ad1feae9a882b6dc4cd35e09adb7e78208.tar.gz |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/oauth/oauth_controller_test.exs')
-rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index adeff8e25..89fcf8c36 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -17,7 +17,8 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do key: "_test", signing_salt: "cooldude" ] - clear_config_all([:instance, :account_activation_required]) + + clear_config([:instance, :account_activation_required]) describe "in OAuth consumer mode, " do setup do |