diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-12 18:01:11 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-12 18:01:11 +0000 |
| commit | 90661e20cf91b2b1e95fdee73f2e95aa18c1be65 (patch) | |
| tree | 04df310540c2363c289f93e1d48d9b11724ab68d /test | |
| parent | da3f93054392447638d4bc558fae0969e6a9bbf9 (diff) | |
| parent | 85b8590109bc1f1f13ac26fa06b607909ade7bb2 (diff) | |
| download | pleroma-90661e20cf91b2b1e95fdee73f2e95aa18c1be65.tar.gz pleroma-90661e20cf91b2b1e95fdee73f2e95aa18c1be65.zip | |
Merge branch 'patch-3' into 'develop'
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 03c798bef..b3b6c5851 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -47,7 +47,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do %{ shortcode: "2hu", url: "corndog.png", - static_url: "corndog.png" + static_url: "corndog.png", + visible_in_picker: false } ] } |