metadata.moe/social.metadata.moe
1
0
Fork 0
mirror of https://github.com/Babibubebon/social.metadata.moe.git synced 2024-09-23 00:54:21 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feld/cleanup' into 'develop'

Browse source 
Minor cleanup commits

See merge request pleroma/pleroma!4142
This commit is contained in:
feld 2024-06-07 21:52:55 +00:00
commit b23b007d00
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/cleanup.skip Normal file
View file

2
lib/pleroma/application.ex
View file

@ -292,8 +292,6 @@ def limiters_setup do
config = Config.get(ConcurrentLimiter, [])
[
Pleroma.Web.RichMedia.Helpers,
Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy,
Pleroma.Search
]
|> Enum.each(fn module ->

2
lib/pleroma/http/adapter_helper/gun.ex
View file

@ -15,7 +15,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
retry_timeout: 1_000
]
@type pool() :: :federation | :upload | :media | :default
@type pool() :: :federation | :upload | :media | :rich_media | :default
@spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do