summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-23 22:41:31 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-23 22:41:31 +0000
commit19263f30c3819f922586b537467e888574c334d7 (patch)
treee9c7a490b7ed245cf854c072aae932eb54fd38e8 /config
parent760df67a7b767d113a0ff2b351f872caf8751832 (diff)
parentae1d371428e16b738b8ec638e411e5e8c1ac4937 (diff)
downloadpleroma-19263f30c3819f922586b537467e888574c334d7.tar.gz
pleroma-19263f30c3819f922586b537467e888574c334d7.zip
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
-rw-r--r--config/description.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 1988753d6..403ade60d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -509,7 +509,7 @@ config :auto_linker,
class: false,
strip_prefix: false,
new_window: false,
- rel: false
+ rel: "ugc"
]
config :pleroma, :ldap,
diff --git a/config/description.exs b/config/description.exs
index d95250017..38b30bbf6 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1906,7 +1906,7 @@ config :pleroma, :config_description, [
key: :rel,
type: [:string, false],
description: "override the rel attribute. false to clear",
- suggestions: ["noopener noreferrer", false]
+ suggestions: ["ugc", "noopener noreferrer", false]
},
%{
key: :new_window,