diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-13 13:05:40 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-13 13:05:40 +0000 |
| commit | ef37774403ff5af69a637875240eec205b6f55a5 (patch) | |
| tree | 22239f2cc64f27e5db487e0fea919e13137b3e57 /priv | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| parent | 5c76afb06c731557b537f928296e0b5c259f8d5e (diff) | |
| download | pleroma-ef37774403ff5af69a637875240eec205b6f55a5.tar.gz | |
Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs | 1 | ||||
| -rw-r--r-- | priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs index c618ea381..b6f0ac66b 100644 --- a/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs +++ b/priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs @@ -3,7 +3,6 @@ defmodule Pleroma.Repo.Migrations.MigrateOldBookmarks do import Ecto.Query alias Pleroma.Activity alias Pleroma.Bookmark - alias Pleroma.User alias Pleroma.Repo def up do diff --git a/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs b/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs index 2f336a5e8..43d616705 100644 --- a/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs +++ b/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs @@ -1,6 +1,5 @@ defmodule Pleroma.Repo.Migrations.CreateSafeJsonbSet do use Ecto.Migration - alias Pleroma.User def change do execute(""" |