diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-12-02 23:07:24 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-12-02 23:07:24 +0000 |
| commit | e1204c6f25526470e410bb34595ec1e7b3502371 (patch) | |
| tree | ed5c4cb8abc477f11d4c4194b5db26b7bc877f68 /lib | |
| parent | 371d96b1da85960dafea9665b8bc32ba553b1555 (diff) | |
| parent | e3f3d13d994e2b65d796818ee424b854f83c1223 (diff) | |
| download | pleroma-e1204c6f25526470e410bb34595ec1e7b3502371.tar.gz pleroma-e1204c6f25526470e410bb34595ec1e7b3502371.zip | |
Merge branch 'user_info_fixes_again' into 'develop'
User info fixes again
See merge request pleroma/pleroma!489
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/sample_psql.eex | 1 | ||||
| -rw-r--r-- | lib/pleroma/user/info.ex | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/mix/tasks/sample_psql.eex b/lib/mix/tasks/sample_psql.eex index b6f57948b..c89b34ef2 100644 --- a/lib/mix/tasks/sample_psql.eex +++ b/lib/mix/tasks/sample_psql.eex @@ -4,3 +4,4 @@ CREATE DATABASE pleroma_dev OWNER pleroma; --Extensions made by ecto.migrate that need superuser access CREATE EXTENSION IF NOT EXISTS citext; CREATE EXTENSION IF NOT EXISTS pg_trgm; +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 94d403bf7..49b2f0eda 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -4,7 +4,7 @@ defmodule Pleroma.User.Info do embedded_schema do field(:banner, :map, default: %{}) - field(:background, :string, default: nil) + field(:background, :map, default: %{}) field(:source_data, :map, default: %{}) field(:note_count, :integer, default: 0) field(:follower_count, :integer, default: 0) @@ -134,7 +134,8 @@ defmodule Pleroma.User.Info do :locked, :no_rich_text, :default_scope, - :banner + :banner, + :background ]) end |