pleroma

commit: 63798e89deb2079cc0828c8722489c907c13f93c
parent: 2909dc873b1cf4b2fdfd310d2bb61104d31cea17
Author: feld <feld@feld.me>
Date:   Tue, 14 Jul 2020 18:05:36 +0000

Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'

Fix in-db configuration in dev environment

See merge request pleroma/pleroma!2764
Diffstat:
M
lib/pleroma/application.ex
4
++++
M
mix.exs
2
--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -35,6 +35,10 @@ defmodule Pleroma.Application do
   # See http://elixir-lang.org/docs/stable/elixir/Application.html
   # for more information on OTP Applications
   def start(_type, _args) do
+    # Scrubbers are compiled at runtime and therefore will cause a conflict
+    # every time the application is restarted, so we disable module
+    # conflicts at runtime
+    Code.compiler_options(ignore_module_conflict: true)
     Config.Holder.save_default()
     Pleroma.HTML.compile_scrubbers()
     Config.DeprecationWarnings.warn()
diff --git a/mix.exs b/mix.exs
@@ -90,8 +90,6 @@ defmodule Pleroma.Mixfile do
   defp elixirc_paths(_), do: ["lib"]
 
   defp warnings_as_errors(:prod), do: false
-  # Uncomment this if you need testing configurable_from_database logic
-  # defp warnings_as_errors(:dev), do: false
   defp warnings_as_errors(_), do: true
 
   # Specifies OAuth dependencies.