aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/config/loader.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-07-13 22:47:47 -0500
committerAlex Gleason <alex@alexgleason.me>2021-07-13 22:47:47 -0500
commitdeb3f911366925bcc342a4a0deb44a2e7da7f1ba (patch)
treec8e587198f64c4c5f991a05561943c6bd0af465b /lib/pleroma/config/loader.ex
parent5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43 (diff)
parent173e977e283789a814278c63bc81f40a13942e21 (diff)
downloadpleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.tar.gz
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
Diffstat (limited to 'lib/pleroma/config/loader.ex')
-rw-r--r--lib/pleroma/config/loader.ex6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/config/loader.ex b/lib/pleroma/config/loader.ex
index b64d06707..2a945999e 100644
--- a/lib/pleroma/config/loader.ex
+++ b/lib/pleroma/config/loader.ex
@@ -3,9 +3,11 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.Loader do
+ # These modules are only being used as keys here (for equality check),
+ # so it's okay to use `Module.concat/1` to have the compiler ignore them.
@reject_keys [
- Pleroma.Repo,
- Pleroma.Web.Endpoint,
+ Module.concat(["Pleroma.Repo"]),
+ Module.concat(["Pleroma.Web.Endpoint"]),
:env,
:configurable_from_database,
:database,