aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander <alex.strizhakov@gmail.com>2019-11-10 22:54:37 +0300
committerAlexander <alex.strizhakov@gmail.com>2019-11-10 22:54:37 +0300
commit6a4201e0b444748318845caddf0e972d0fac87d7 (patch)
tree180e163216ab50cb9b5efd940c1059a9aea8ebac
parent7438c177d9f57e8779b979ca553c3b501726efb3 (diff)
downloadpleroma-6a4201e0b444748318845caddf0e972d0fac87d7.tar.gz
fix for migrate task
-rw-r--r--lib/mix/tasks/pleroma/config.ex2
-rw-r--r--lib/pleroma/docs/json.ex2
-rw-r--r--test/web/admin_api/admin_api_controller_test.exs4
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 11e4fde43..0e21408b2 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -45,7 +45,7 @@ defmodule Mix.Tasks.Pleroma.Config do
if Pleroma.Config.get([:instance, :dynamic_configuration]) do
config_path = "config/#{env}.exported_from_db.secret.exs"
- {:ok, file} = File.open(config_path, [:write])
+ {:ok, file} = File.open(config_path, [:write, :utf8])
IO.write(file, "use Mix.Config\r\n")
Repo.all(Config)
diff --git a/lib/pleroma/docs/json.ex b/lib/pleroma/docs/json.ex
index 18ba01d58..f2a56d845 100644
--- a/lib/pleroma/docs/json.ex
+++ b/lib/pleroma/docs/json.ex
@@ -5,7 +5,7 @@ defmodule Pleroma.Docs.JSON do
def process(descriptions) do
config_path = "docs/generate_config.json"
- with {:ok, file} <- File.open(config_path, [:write]),
+ with {:ok, file} <- File.open(config_path, [:write, :utf8]),
json <- generate_json(descriptions),
:ok <- IO.write(file, json),
:ok <- File.close(file) do
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index 2a9e4f5a0..bc9235309 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -2269,6 +2269,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
Pleroma.Config.put([:instance, :dynamic_configuration], true)
end
+ clear_config([:feed, :post_title]) do
+ Pleroma.Config.put([:feed, :post_title], %{max_length: 100, omission: "…"})
+ end
+
test "transfer settings to DB and to file", %{conn: conn, admin: admin} do
assert Pleroma.Repo.all(Pleroma.Web.AdminAPI.Config) == []
conn = get(conn, "/api/pleroma/admin/config/migrate_to_db")