pleroma

commit: 417f9a782f3a8b549c6b2493b0965e68eddc9403
parent: e73cc742b92ff957c234f395035ade9948088bf0
Author: lain <lain@soykaf.club>
Date:   Mon, 11 Nov 2019 12:13:45 +0000

Merge branch 'fix/1399' into 'develop'

fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964
Diffstat:
M
lib/mix/tasks/pleroma/config.ex
2
+-
M
lib/pleroma/docs/json.ex
2
+-
M
test/web/admin_api/admin_api_controller_test.exs
4
++++

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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")