Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 @@ defmodule Pleroma.Application do
config = Config.get(ConcurrentLimiter, []) config = Config.get(ConcurrentLimiter, [])
[ [
Pleroma.Web.RichMedia.Helpers,
Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy,
Pleroma.Search Pleroma.Search
] ]
|> Enum.each(fn module -> |> 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 retry_timeout: 1_000
] ]
@type pool() :: :federation | :upload | :media | :default @type pool() :: :federation | :upload | :media | :rich_media | :default
@spec options(keyword(), URI.t()) :: keyword() @spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do def options(incoming_opts \\ [], %URI{} = uri) do