diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-24 08:58:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-24 08:58:07 +0300 |
| commit | 293281fcbdba793604316f16f42d0de5ed816941 (patch) | |
| tree | dd5484d4517d56edfdb697be2f31099a97073828 /lib | |
| parent | 2cfe1b93854c117fda19e54ea17c99f72413a569 (diff) | |
| parent | a182d400d7d5aa414240b156965533c0e9b222d0 (diff) | |
| download | pleroma-293281fcbdba793604316f16f42d0de5ed816941.tar.gz | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/config.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/config/config_db.ex | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex index 861832451..3e76d2c97 100644 --- a/lib/mix/tasks/pleroma/config.ex +++ b/lib/mix/tasks/pleroma/config.ex @@ -52,6 +52,9 @@ defmodule Mix.Tasks.Pleroma.Config do defp do_migrate_to_db(config_file) do if File.exists?(config_file) do + Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;") + Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;") + custom_config = config_file |> read_file() diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex index 91a1aa0cc..be6688095 100644 --- a/lib/pleroma/config/config_db.ex +++ b/lib/pleroma/config/config_db.ex @@ -416,7 +416,7 @@ defmodule Pleroma.ConfigDB do @spec is_module_name?(String.t()) :: boolean() def is_module_name?(string) do - Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth)\./, string) or + Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth|Swoosh)\./, string) or string in ["Oban", "Ueberauth", "ExSyslogger"] end end |