diff options
| author | lain <lain@soykaf.club> | 2020-06-15 12:41:48 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-15 12:41:48 +0000 |
| commit | 1e49bfa9acb4176a161181edcaf04e886c638c42 (patch) | |
| tree | be012617d0d1795222aaa2d2177428e9aa43379f /config | |
| parent | 448e93ce2c1eab9eb91118b90f661c31056e4781 (diff) | |
| parent | bd63089a633099233d4fc19faece2796253a7ee0 (diff) | |
| download | pleroma-1e49bfa9acb4176a161181edcaf04e886c638c42.tar.gz pleroma-1e49bfa9acb4176a161181edcaf04e886c638c42.zip | |
Merge branch 'merge-ogp-twitter-parsers' into 'develop'
Merge OGP parser with TwitterCard
Closes #1835
See merge request pleroma/pleroma!2642
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 7a70164f3..6a7bb9e06 100644 --- a/config/config.exs +++ b/config/config.exs @@ -387,7 +387,6 @@ config :pleroma, :rich_media, ignore_tld: ["local", "localdomain", "lan"], parsers: [ Pleroma.Web.RichMedia.Parsers.TwitterCard, - Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.OEmbed ], ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] diff --git a/config/description.exs b/config/description.exs index 2f1eaf5f2..b21d7840c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2104,9 +2104,7 @@ config :pleroma, :config_description, [ description: "List of Rich Media parsers. Module names are shortened (removed leading `Pleroma.Web.RichMedia.Parsers.` part), but on adding custom module you need to use full name.", suggestions: [ - Pleroma.Web.RichMedia.Parsers.MetaTagsParser, Pleroma.Web.RichMedia.Parsers.OEmbed, - Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.TwitterCard ] }, |