projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
[akkoma]
/
test
/
fixtures
/
config
/
temp.secret.exs
diff --git
a/test/fixtures/config/temp.secret.exs
b/test/fixtures/config/temp.secret.exs
index f4686c101964ab4a18e4d830608cc0f1190ec9d8..9c5c88d98890f2745d0b9afd975979b51b21333d 100644
(file)
--- a/
test/fixtures/config/temp.secret.exs
+++ b/
test/fixtures/config/temp.secret.exs
@@
-1,4
+1,8
@@
-use Mix.Config
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+import Config
config :pleroma, :first_setting, key: "value", key2: [Pleroma.Repo]
config :pleroma, :first_setting, key: "value", key2: [Pleroma.Repo]
@@
-7,3
+11,7
@@
config :pleroma, :second_setting, key: "value2", key2: ["Activity"]
config :quack, level: :info
config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
config :quack, level: :info
config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
+
+config :postgrex, :json_library, Poison
+
+config :pleroma, :database, rum_enabled: true