Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (145 commits) CHANGELOG.md: Remove wrong entries from Unreleased(patch) Only run one attachment cleanup job per node Just validate command is in PATH; forking a shell is wasteful Linting. Pbkdf2: Use it everywhere. Password -> Password.Pbkdf2 Linting Password: Replace Pbkdf2 with Password. Password: Add password module COPYING: Bump copyright to 2021 Bump Copyright to 2021 Pagination: Don't be dos'd by random parameters. Simplify. We will always have a result from Upload.base_url/0, so just add it to the list Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains ChatMessages: Fix pagination headers. Formatting .formatter.exs: Format optional migrations Add development section Apply 4 suggestion(s) to 2 file(s) Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0 ...
This commit is contained in:
commit
697397e2b8
923 changed files with 3051 additions and 2114 deletions
|
|
@ -47,7 +47,6 @@ use Mix.Config
|
|||
config :pleroma, ecto_repos: [Pleroma.Repo]
|
||||
|
||||
config :pleroma, Pleroma.Repo,
|
||||
types: Pleroma.PostgresTypes,
|
||||
telemetry_event: [Pleroma.Repo.Instrumenter],
|
||||
migration_lock: nil
|
||||
|
||||
|
|
@ -64,14 +63,6 @@ config :pleroma, Pleroma.Upload,
|
|||
filters: [Pleroma.Upload.Filter.Dedupe],
|
||||
link_name: false,
|
||||
proxy_remote: false,
|
||||
proxy_opts: [
|
||||
redirect_on_failure: false,
|
||||
max_body_length: 25 * 1_048_576,
|
||||
http: [
|
||||
follow_redirect: true,
|
||||
pool: :upload
|
||||
]
|
||||
],
|
||||
filename_display_max_length: 30,
|
||||
default_description: :filename
|
||||
|
||||
|
|
@ -565,7 +556,7 @@ config :pleroma, Oban,
|
|||
scheduled_activities: 10,
|
||||
background: 5,
|
||||
remote_fetcher: 2,
|
||||
attachments_cleanup: 5,
|
||||
attachments_cleanup: 1,
|
||||
new_users_digest: 1,
|
||||
mute_expire: 5
|
||||
],
|
||||
|
|
@ -662,7 +653,7 @@ config :pleroma, :email_notifications,
|
|||
}
|
||||
|
||||
config :pleroma, :oauth2,
|
||||
token_expires_in: 3600 * 24 * 30,
|
||||
token_expires_in: 3600 * 24 * 365 * 100,
|
||||
issue_new_refresh_token: true,
|
||||
clean_expired_tokens: false
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue