commit: c2527b8c63a4e35b121981efe2c39cc54c77648d
parent: 34fd1c2c9d685c160fd2c20602840bfa9dceb38f
Author: rinpatch <rinpatch@sdf.org>
Date: Mon, 16 Mar 2020 11:08:06 +0000
Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
Diffstat:
2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/config/benchmark.exs b/config/benchmark.exs
@@ -61,8 +61,6 @@ config :web_push_encryption, :vapid_details,
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
-config :pleroma_job_queue, disabled: true
-
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
diff --git a/config/description.exs b/config/description.exs
@@ -1781,25 +1781,6 @@ config :pleroma, :config_description, [
]
},
%{
- group: :pleroma_job_queue,
- key: :queues,
- type: :group,
- description: "[Deprecated] Replaced with `Oban`/`:queues` (keeping the same format)"
- },
- %{
- group: :pleroma,
- key: Pleroma.Web.Federator.RetryQueue,
- type: :group,
- description: "[Deprecated] See `Oban` and `:workers` sections for configuration notes",
- children: [
- %{
- key: :max_retries,
- type: :integer,
- description: "[Deprecated] Replaced as `Oban`/`:queues`/`:outgoing_federation` value"
- }
- ]
- },
- %{
group: :pleroma,
key: Oban,
type: :group,
@@ -2578,19 +2559,6 @@ config :pleroma, :config_description, [
]
},
%{
- group: :tesla,
- type: :group,
- description: "Tesla settings",
- children: [
- %{
- key: :adapter,
- type: :module,
- description: "Tesla adapter",
- suggestions: [Tesla.Adapter.Hackney]
- }
- ]
- },
- %{
group: :pleroma,
key: :chat,
type: :group,