Page MenuHomePhorge
Files F85595820

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index d160ce533..bfdd01c70 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -342,6 +342,7 @@ defmodule Mix.Tasks.Pleroma.Config do
end
end
end
+
@spec migrate_to_db(Path.t() | nil) :: any()
def migrate_to_db(file_path \\ nil) do
with :ok <- Pleroma.Config.DeprecationWarnings.warn() do
diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 503fbc14d..78c798a3b 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -212,7 +212,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
{blacklisted_group, blacklisted_key} ->
group == inspect(blacklisted_group) and key == inspect(blacklisted_key)
- end)
+ end)
else
true
end
diff --git a/test/mix/tasks/pleroma/config_test.exs b/test/mix/tasks/pleroma/config_test.exs
index b35e0aed8..7513e958e 100644
--- a/test/mix/tasks/pleroma/config_test.exs
+++ b/test/mix/tasks/pleroma/config_test.exs
@@ -372,10 +372,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
test "filters blacklisted settings" do
clear_config(:database_config_whitelist, [{:pleroma}])
- clear_config(:database_config_blacklist, [
- {:pleroma, :logger},
- {:blacklisted_group}
- ])
+ clear_config(:database_config_blacklist, [{:pleroma, :logger}, {:blacklisted_group}])
insert_config_record(:pleroma, :logger, backends: :console)
insert_config_record(:web_push_encryption, :vapid_details, a: 1)
@@ -387,7 +384,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
%ConfigDB{group: :pleroma, key: :instance},
%ConfigDB{group: :pleroma, key: Pleroma.Captcha},
%ConfigDB{group: :pleroma2, key: :key2},
- %ConfigDB{group: :web_push_encryption, key: :vapid_details},
+ %ConfigDB{group: :web_push_encryption, key: :vapid_details}
] = config_records()
end
diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
index 047662d39..902b30cdd 100644
--- a/test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@ -1246,7 +1246,12 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
test "doesn't set keys in the blacklist", %{conn: conn} do
- clear_config(:database_config_blacklist, [{:pleroma, :logger}, {:pleroma, :key2}, {:pleroma, Pleroma.Captcha.NotReal}, {:blacklisted_group}])
+ clear_config(:database_config_blacklist, [
+ {:pleroma, :logger},
+ {:pleroma, :key2},
+ {:pleroma, Pleroma.Captcha.NotReal},
+ {:blacklisted_group}
+ ])
conn
|> put_req_header("content-type", "application/json")
@@ -1563,9 +1568,14 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
test "filters by database configuration blacklist and whitelist", %{conn: conn} do
- clear_config(:database_config_whitelist, [{:pleroma, :instance}, {:pleroma, :activitypub}, {:pleroma, Pleroma.Upload}])
+ clear_config(:database_config_whitelist, [
+ {:pleroma, :instance},
+ {:pleroma, :activitypub},
+ {:pleroma, Pleroma.Upload}
+ ])
+
clear_config(:database_config_blacklist, [
- {:pleroma, Pleroma.Upload},
+ {:pleroma, Pleroma.Upload}
])
children =

File Metadata

Mime Type
text/x-diff
Expires
Mon, Jul 20, 7:14 AM (1 d, 19 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1695458
Default Alt Text
(3 KB)

Event Timeline