Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings See merge request pleroma/pleroma!2302
This commit is contained in:
commit
c2527b8c63
|
@ -61,8 +61,6 @@
|
||||||
|
|
||||||
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
|
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
|
||||||
|
|
||||||
config :pleroma_job_queue, disabled: true
|
|
||||||
|
|
||||||
config :pleroma, Pleroma.ScheduledActivity,
|
config :pleroma, Pleroma.ScheduledActivity,
|
||||||
daily_user_limit: 2,
|
daily_user_limit: 2,
|
||||||
total_user_limit: 3,
|
total_user_limit: 3,
|
||||||
|
|
|
@ -1780,25 +1780,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
%{
|
|
||||||
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,
|
group: :pleroma,
|
||||||
key: Oban,
|
key: Oban,
|
||||||
|
@ -2577,19 +2558,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
%{
|
|
||||||
group: :tesla,
|
|
||||||
type: :group,
|
|
||||||
description: "Tesla settings",
|
|
||||||
children: [
|
|
||||||
%{
|
|
||||||
key: :adapter,
|
|
||||||
type: :module,
|
|
||||||
description: "Tesla adapter",
|
|
||||||
suggestions: [Tesla.Adapter.Hackney]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
%{
|
%{
|
||||||
group: :pleroma,
|
group: :pleroma,
|
||||||
key: :chat,
|
key: :chat,
|
||||||
|
|
Loading…
Reference in a new issue