diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-22 15:46:02 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-22 15:46:02 +0000 |
| commit | 5d0ac015dcd75511898c50c166d53fe91990fdae (patch) | |
| tree | 5402ca123349966c3b17a50392c421c8c41e7874 /test/fixtures | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| parent | fe40f6f2910967609f7aa952d69981cadc47372c (diff) | |
| download | pleroma-5d0ac015dcd75511898c50c166d53fe91990fdae.tar.gz pleroma-5d0ac015dcd75511898c50c166d53fe91990fdae.zip | |
Merge branch 'mix_config_deprecation' into 'develop'
Switch from the deprecated "use Mix.config" to "import Config"
See merge request pleroma/pleroma!3413
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/config/temp.exported_from_db.secret.exs | 2 | ||||
| -rw-r--r-- | test/fixtures/config/temp.secret.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/fixtures/config/temp.exported_from_db.secret.exs b/test/fixtures/config/temp.exported_from_db.secret.exs index 64bee7f32..dda5d0fa6 100644 --- a/test/fixtures/config/temp.exported_from_db.secret.exs +++ b/test/fixtures/config/temp.exported_from_db.secret.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config config :pleroma, exported_config_merged: true 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] |