aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/html.ex
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-24 13:00:48 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-24 13:00:48 +0300
commit5e9759cd7d0730c14bcc44e9b3dbda94947d602f (patch)
tree5917d89cad99d14a246e33f3e8ebd56e70abe20b /lib/pleroma/html.ex
parent79c3443b609663ab23a4353ebdb7e5e2f0e6a150 (diff)
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff)
downloadpleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.tar.gz
Merge branch 'develop' into feature/return-link-for-password-reset
Diffstat (limited to 'lib/pleroma/html.ex')
-rw-r--r--lib/pleroma/html.ex6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
index 3951f0f51..937bafed5 100644
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@@ -184,7 +184,8 @@ defmodule Pleroma.HTML.Scrubber.Default do
"tag",
"nofollow",
"noopener",
- "noreferrer"
+ "noreferrer",
+ "ugc"
])
Meta.allow_tag_with_these_attributes("a", ["name", "title"])
@@ -304,7 +305,8 @@ defmodule Pleroma.HTML.Scrubber.LinksOnly do
"nofollow",
"noopener",
"noreferrer",
- "me"
+ "me",
+ "ugc"
])
Meta.allow_tag_with_these_attributes("a", ["name", "title"])