diff options
| author | feld <feld@feld.me> | 2020-07-14 18:05:36 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-07-14 18:05:36 +0000 |
| commit | 63798e89deb2079cc0828c8722489c907c13f93c (patch) | |
| tree | 0b1c9393d27d7d6cc464520f467d28e9e07a0d76 /lib | |
| parent | 2909dc873b1cf4b2fdfd310d2bb61104d31cea17 (diff) | |
| parent | e6ccc2556568f2180c3ce1945bdc7a0cba97e924 (diff) | |
| download | pleroma-63798e89deb2079cc0828c8722489c907c13f93c.tar.gz | |
Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'
Fix in-db configuration in dev environment
See merge request pleroma/pleroma!2764
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/application.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index b68a373a4..3282c6882 100644 --- 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() |