hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/article-support' into 'develop'

Browse source 
article support (plume, etc)

See merge request pleroma/pleroma!240
This commit is contained in:
lambda 2018-07-12 05:58:39 +00:00
commit 4a922305af
6 changed files with 58 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/twitter_api/representers/activity_representer_test.exs
View file

@ -126,7 +126,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
}
expected_html =
"<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{
"<p>2hu</p>alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{
mentioned_user.ap_id
}\">@shp</a>"