diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-03 00:29:51 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-03 00:29:51 +0400 |
| commit | 4f3313bf80ad126e1f5bc95282793d6e101318d8 (patch) | |
| tree | 65ad61d45ade608004e9d9eda36a6eef1bc29bc1 | |
| parent | 4a45b96a91485a39f26bcc86b6cbd21d1547511e (diff) | |
| parent | 4c02e049358441529c54a72cd11f1c81ee897d49 (diff) | |
| download | pleroma-4f3313bf80ad126e1f5bc95282793d6e101318d8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | docs/installation/otp_en.md | 9 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d05837016..462c7c2a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Logger: default log level changed from `warn` to `info`. - Config mix task `migrate_to_db` truncates `config` table before migrating the config file. - Allow account registration without an email +- Default to `prepare: :unnamed` in the database configuration. <details> <summary>API Changes</summary> diff --git a/config/config.exs b/config/config.exs index 9c4eb70a3..2cd741213 100644 --- a/config/config.exs +++ b/config/config.exs @@ -624,7 +624,9 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false -config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"] +config :pleroma, Pleroma.Repo, + parameters: [gin_fuzzy_search_limit: "500"], + prepare: :unnamed # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md index aab5197a2..32551f7b6 100644 --- a/docs/installation/otp_en.md +++ b/docs/installation/otp_en.md @@ -73,6 +73,15 @@ rc-service postgresql restart systemctl restart postgresql ``` +If you are using PostgreSQL 12 or higher, add this to your Ecto database configuration + +```elixir +prepare: :named, +parameters: [ + plan_cache_mode: "force_custom_plan" +] +``` + ### Installing Pleroma ```sh # Create a Pleroma user |