diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-30 02:02:30 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-30 02:02:30 -0500 |
| commit | 99cc26bb02f2ac7ab26aa761ee5427406830a778 (patch) | |
| tree | 6e2be1eef0179a001eedbe1aeb23825a535245a6 /test/fixtures/config | |
| parent | beb1c98ab5e0848127a4490180364552f6fcdbf5 (diff) | |
| parent | 5717256ebab1a8927e9e5889aa4629148aa39fb6 (diff) | |
| download | pleroma-99cc26bb02f2ac7ab26aa761ee5427406830a778.tar.gz pleroma-99cc26bb02f2ac7ab26aa761ee5427406830a778.zip | |
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
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] |