diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
| commit | 05b47aacd25a86ba6dfcdd6577c6c558229c8e95 (patch) | |
| tree | e4ecd6498fc64a78bf8d92c2ca6e8f8edc0fbcfe /test/fixtures/config | |
| parent | 9b0b0842ce2b0b9a870f57e16025160855aa4c11 (diff) | |
| parent | 7ad87571bdcd39959280d15f5bfe4175e04c442c (diff) | |
| download | pleroma-endpoint-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into endpoint-urlendpoint-url
Diffstat (limited to 'test/fixtures/config')
| -rw-r--r-- | test/fixtures/config/temp.exported_from_db.secret.exs | 5 | ||||
| -rw-r--r-- | test/fixtures/config/temp.secret.exs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/fixtures/config/temp.exported_from_db.secret.exs b/test/fixtures/config/temp.exported_from_db.secret.exs new file mode 100644 index 000000000..dda5d0fa6 --- /dev/null +++ b/test/fixtures/config/temp.exported_from_db.secret.exs @@ -0,0 +1,5 @@ +import Config + +config :pleroma, exported_config_merged: true + +config :pleroma, :first_setting, key: "new value" diff --git a/test/fixtures/config/temp.secret.exs b/test/fixtures/config/temp.secret.exs index 4b3af39ec..9c5c88d98 100644 --- a/test/fixtures/config/temp.secret.exs +++ b/test/fixtures/config/temp.secret.exs @@ -2,7 +2,7 @@ # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -use Mix.Config +import Config config :pleroma, :first_setting, key: "value", key2: [Pleroma.Repo] |