limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

fix for migrate task

Browse source
This commit is contained in:
Alexander 2019-11-10 22:54:37 +03:00
parent 7438c177d9
commit 6a4201e0b4
No known key found for this signature in database
GPG key ID: 7AE1AD696BA41708
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mix/tasks/pleroma/config.ex
View file

@ -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)

2
lib/pleroma/docs/json.ex
View file

@ -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

4
test/web/admin_api/admin_api_controller_test.exs
View file

@ -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")