diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
| commit | 9d89e1736a08d6c559355e52a996782994608cd4 (patch) | |
| tree | cf34422a48ea0e6cad4299db7816b094512416fe /test/fixtures/config | |
| parent | 9166ae1bcf8a8ec113bb21aab7effca5a14601ca (diff) | |
| parent | 3fe6ada6fc6f42057cb346c04e4ecc9f35c0e5cb (diff) | |
| download | pleroma-cycles-config-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into cycles-config-urlcycles-config-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] |