Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
This commit is contained in:
commit
b39eb6ecc5
206 changed files with 3621 additions and 1883 deletions
|
|
@ -0,0 +1,10 @@
|
|||
defmodule Pleroma.Repo.Migrations.InstancesAddFavicon do
|
||||
use Ecto.Migration
|
||||
|
||||
def change do
|
||||
alter table(:instances) do
|
||||
add(:favicon, :string)
|
||||
add(:favicon_updated_at, :naive_datetime)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
defmodule Pleroma.Repo.Migrations.DropUserTrigramIndex do
|
||||
@moduledoc "Drops unused trigram index on `users` (FTS index is being used instead)"
|
||||
|
||||
use Ecto.Migration
|
||||
|
||||
def up do
|
||||
drop_if_exists(index(:users, [], name: :users_trigram_index))
|
||||
end
|
||||
|
||||
def down do
|
||||
create_if_not_exists(
|
||||
index(:users, ["(trim(nickname || ' ' || coalesce(name, ''))) gist_trgm_ops"],
|
||||
name: :users_trigram_index,
|
||||
using: :gist
|
||||
)
|
||||
)
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue