summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2021-04-16 09:50:26 +0000
committerrinpatch <rin@patch.cx>2021-04-16 09:50:26 +0000
commit0ababdc068f0fd7655b5f8440a5a8c9759a32fea (patch)
tree76fb01336d4292d9602b40723d4a07402a1fd3b4 /test/fixtures
parent152cb3074e855b0b20011eeb309d9ea5393821aa (diff)
parent681a42c359b4fbae74285363c670dff18aac5918 (diff)
downloadpleroma-0ababdc068f0fd7655b5f8440a5a8c9759a32fea.tar.gz
pleroma-0ababdc068f0fd7655b5f8440a5a8c9759a32fea.zip
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
Reading the file, instead of config keyword in ReleaseRuntimeProvider Closes #2593 See merge request pleroma/pleroma!3381
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/config/temp.exported_from_db.secret.exs5
1 files changed, 5 insertions, 0 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..64bee7f32
--- /dev/null
+++ b/test/fixtures/config/temp.exported_from_db.secret.exs
@@ -0,0 +1,5 @@
+use Mix.Config
+
+config :pleroma, exported_config_merged: true
+
+config :pleroma, :first_setting, key: "new value"