Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (276 commits) Remove `poll` from `notification_type` OpenAPI spec credo fix CHANGELOG.md: mention minimal elixir version update Update OTP releases to official images of 1.10.3 Chunk the notification type backfill migration moving custom ecto types in context folders Upgrade to Elixir 1.9 naming fix attemps to merge map fix for updated hackney Mogrify args as custom tuples Fix tests Changelog: Add info about conversation view changes. Conversations: Return last dm for conversation, not last message. Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page ControllerHelper: Always return id field. Apply suggestion to lib/pleroma/web/controller_helper.ex Remove use of atoms in MRF.UserAllowListPolicy Fix atom leak in Rich Media Parser Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 ...
This commit is contained in:
commit
ce6f690a85
233 changed files with 11215 additions and 5027 deletions
|
|
@ -171,7 +171,8 @@ config :mime, :types, %{
|
|||
"application/ld+json" => ["activity+json"]
|
||||
}
|
||||
|
||||
config :tesla, adapter: Tesla.Adapter.Gun
|
||||
config :tesla, adapter: Tesla.Adapter.Hackney
|
||||
|
||||
# Configures http settings, upstream proxy etc.
|
||||
config :pleroma, :http,
|
||||
proxy_url: nil,
|
||||
|
|
@ -388,6 +389,8 @@ config :pleroma, :mrf_keyword,
|
|||
|
||||
config :pleroma, :mrf_subchain, match_actor: %{}
|
||||
|
||||
config :pleroma, :mrf_activity_expiration, days: 365
|
||||
|
||||
config :pleroma, :mrf_vocabulary,
|
||||
accept: [],
|
||||
reject: []
|
||||
|
|
@ -402,7 +405,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]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue