diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-24 09:29:54 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-24 09:29:54 +0300 |
| commit | c34126f89ca58141cc927bddc2474bef76ea1575 (patch) | |
| tree | 12053338f288a5fa7da00d70130f355036883bd8 | |
| parent | 71700ea6d4104ecd2cc0afb0ac103e722b30fbb5 (diff) | |
| parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
| download | pleroma-c34126f89ca58141cc927bddc2474bef76ea1575.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | docs/config.md | 4 | ||||
| -rw-r--r-- | priv/repo/migrations/20190823000549_add_likes_index_to_objects.exs | 7 |
4 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dc19e79f..fd81b3087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Not being able to pin unlisted posts - Objects being re-embedded to activities after being updated (e.g faved/reposted). Running 'mix pleroma.database prune_objects' again is advised. +- Favorites timeline doing database-intensive queries - Metadata rendering errors resulting in the entire page being inaccessible - `federation_incoming_replies_max_depth` option being ignored in certain cases - Federation/MediaProxy not working with instances that have wrong certificate order diff --git a/config/config.exs b/config/config.exs index 43d114d70..9a8c69448 100644 --- a/config/config.exs +++ b/config/config.exs @@ -275,8 +275,8 @@ config :pleroma, :instance, user_name_length: 100, max_account_fields: 10, max_remote_account_fields: 20, - account_field_name_length: 255, - account_field_value_length: 255, + account_field_name_length: 512, + account_field_value_length: 512, external_user_synchronization: true config :pleroma, :markup, diff --git a/docs/config.md b/docs/config.md index 5b2c3a022..72e36db83 100644 --- a/docs/config.md +++ b/docs/config.md @@ -134,8 +134,8 @@ config :pleroma, Pleroma.Emails.Mailer, * `dynamic_configuration`: Allow transferring configuration to DB with the subsequent customization from Admin api. * `max_account_fields`: The maximum number of custom fields in the user profile (default: `10`) * `max_remote_account_fields`: The maximum number of custom fields in the remote user profile (default: `20`) -* `account_field_name_length`: An account field name maximum length (default: `255`) -* `account_field_value_length`: An account field value maximum length (default: `255`) +* `account_field_name_length`: An account field name maximum length (default: `512`) +* `account_field_value_length`: An account field value maximum length (default: `512`) * `external_user_synchronization`: Enabling following/followers counters synchronization for external users. diff --git a/priv/repo/migrations/20190823000549_add_likes_index_to_objects.exs b/priv/repo/migrations/20190823000549_add_likes_index_to_objects.exs new file mode 100644 index 000000000..13f3d6e83 --- /dev/null +++ b/priv/repo/migrations/20190823000549_add_likes_index_to_objects.exs @@ -0,0 +1,7 @@ +defmodule Pleroma.Repo.Migrations.AddLikesIndexToObjects do + use Ecto.Migration + + def change do + create_if_not_exists index(:objects, ["(data->'likes')"], using: :gin, name: :objects_likes) + end +end |