diff options
| author | feld <feld@feld.me> | 2024-06-07 21:52:55 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-06-07 21:52:55 +0000 |
| commit | b23b007d000b524b4997fcf975d1963fa832c720 (patch) | |
| tree | ae1770052a348ff5b88d7a7fab7219a8a023aafc | |
| parent | a4bd89c77e668ac3c17289c3ee9b8574efe47072 (diff) | |
| parent | d98b1c2757409bf4b96e126e96ec8fd114a723d4 (diff) | |
| download | pleroma-b23b007d000b524b4997fcf975d1963fa832c720.tar.gz pleroma-b23b007d000b524b4997fcf975d1963fa832c720.zip | |
Merge branch 'feld/cleanup' into 'develop'
Minor cleanup commits
See merge request pleroma/pleroma!4142
| -rw-r--r-- | changelog.d/cleanup.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/application.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/http/adapter_helper/gun.ex | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/changelog.d/cleanup.skip b/changelog.d/cleanup.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/cleanup.skip diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 0d9757b44..d98293e8e 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -292,8 +292,6 @@ defmodule Pleroma.Application do config = Config.get(ConcurrentLimiter, []) [ - Pleroma.Web.RichMedia.Helpers, - Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, Pleroma.Search ] |> Enum.each(fn module -> diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex index 74ab9851e..1fe8dd4b2 100644 --- a/lib/pleroma/http/adapter_helper/gun.ex +++ b/lib/pleroma/http/adapter_helper/gun.ex @@ -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 |