Mark Felder
f5ef7fe43b
Fix test warnings
2021-06-07 16:06:53 -05:00
feld
b553bfd745
Merge branch 'fix/prune-hashtags' into 'develop'
...
get prune_objects to work again
See merge request pleroma/pleroma!3397
2021-06-07 20:11:45 +00:00
feld
676c3c96dc
Merge branch 'cycles-mrf-policy' into 'develop'
...
Recompilation speedup: create MRF.Policy behaviour separate from MRF module
See merge request pleroma/pleroma!3450
2021-06-07 20:10:20 +00:00
feld
9a357d63f0
Update CHANGELOG.md
2021-06-07 20:07:59 +00:00
feld
10abbf13ba
Update CHANGELOG.md
2021-06-07 20:07:27 +00:00
feld
84f42b92f0
Merge branch 'develop' into 'fix/prune-hashtags'
...
# Conflicts:
# CHANGELOG.md
2021-06-07 20:06:36 +00:00
feld
4ca380490f
Update CHANGELOG.md
2021-06-07 20:05:18 +00:00
feld
c31338abe6
Update CHANGELOG.md
2021-06-07 20:04:27 +00:00
feld
bc51dea425
Update lib/mix/tasks/pleroma/database.ex
2021-06-07 20:02:28 +00:00
feld
64bc0c69ed
Merge branch 'fix/plug_parser_multipart' into 'develop'
...
web endpoint: Use Config.get directly instead of a tuple
See merge request pleroma/pleroma!3445
2021-06-07 19:58:37 +00:00
Alex Gleason
6fcfa33e4e
Fix MRF.config_descriptions/0
2021-06-07 14:52:57 -05:00
Alex Gleason
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
feld
ca1eac01dd
Merge branch 'notification-settings-docs-fix' into 'develop'
...
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings
See merge request pleroma/pleroma!3448
2021-06-07 17:03:51 +00:00
feld
96e85ea687
Merge branch 'cycles-reverse-proxy' into 'develop'
...
Recompilation speedup: create Dynamic client for ReverseProxy
See merge request pleroma/pleroma!3440
2021-06-07 17:03:19 +00:00
Alex Gleason
879c2db0bd
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings
2021-06-07 11:18:14 -05:00
Alex Gleason
3be08e7c2e
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
2021-06-04 21:12:37 -05:00
Alex Gleason
1c3fe43d23
ReverseProxy: create Client.Wrapper to call client from config
...
Speeds up recompilation by reducing compile-time cycles
2021-06-04 21:12:24 -05:00
feld
94687e2393
Merge branch 'chore/otp24-changelog' into 'develop'
...
Document OTP 24 support
See merge request pleroma/pleroma!3447
2021-06-04 20:57:28 +00:00
feld
5b9e13fc0d
Merge branch 'fix/clear_config_warning' into 'develop'
...
Fix warning for misuse of clear_config/2
See merge request pleroma/pleroma!3446
2021-06-04 20:55:21 +00:00
Mark Felder
eb150e7d88
Document OTP 24 support so we remember to add it to the official release notes / announcement
2021-06-04 15:50:10 -05:00
Mark Felder
d5daf59f88
Fix warning for misuse of clear_config/2
...
The old warning message was producing an improperly formatted suggestion.
2021-06-04 15:48:26 -05:00
Haelwenn
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
Haelwenn (lanodan) Monnier
7d350b73f5
web endpoint: Use Config.get directly instead of a tuple
...
Fixes a lot of warnings like the following while running the testsuite:
warning: passing a {module, function, args} tuple to Plug.Parsers.MULTIPART is deprecated. Please see Plug.Parsers.MULTIPART module docs for better approaches to configuration
This might mean no more dynamic configuration but there seems to be the same limitation two lines underneath anyway.
2021-06-04 20:04:30 +02:00
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
2021-06-04 17:37:30 +00:00
feld
922f4e3fb7
Merge branch 'bugfix/erlang-24' into 'develop'
...
Erlang 24 compatibility
Closes #2647
See merge request pleroma/pleroma!3405
2021-06-04 17:36:36 +00:00
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05:00
Haelwenn (lanodan) Monnier
11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
...
Since mime 1.6.0:
warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead
As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43
2021-06-03 19:11:17 +02:00
Haelwenn (lanodan) Monnier
24d66b60a0
request_builder_test: mode :read got removed
2021-06-03 19:11:17 +02:00
Haelwenn (lanodan) Monnier
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
7c5e007b9c
mix: Update pot to ~> 1.0
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
2768063387
mix: Update dependencies
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
2021-06-03 19:11:15 +02:00
Haelwenn (lanodan) Monnier
166455c884
mix: Switch hackney & gun to releases
2021-06-03 19:10:47 +02:00
Haelwenn (lanodan) Monnier
59af07f149
Update all dependencies
2021-06-03 19:10:47 +02:00
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
rinpatch
194a41611b
Merge branch 'chore/cicd_skip_nonsense' into 'develop'
...
Skip CI/CD automatically under certain conditions
See merge request pleroma/pleroma!3439
2021-06-02 17:18:10 +00:00
Mark Felder
9f391da73d
Don't generate new specs unless they've changed.
2021-06-02 12:09:41 -05:00
Mark Felder
e06466a532
Skip build, test, analysis/lint when we don't make code changes
2021-06-02 12:03:34 -05:00
feld
275af29302
Merge branch 'Snow-develop-patch-01683' into 'develop'
...
Update docs/description for allow_relay
See merge request pleroma/pleroma!3438
2021-06-02 16:53:37 +00:00
Mark Felder
679d4c23e9
Update wording for relays in docs and config description
2021-06-02 11:30:09 -05:00
Mark Felder
297feb73f4
Formatting
2021-06-02 11:21:04 -05:00
feld
e8de1005f2
Merge branch 'cycles-email' into 'develop'
...
Recompilation speedup: Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
See merge request pleroma/pleroma!3436
2021-06-02 16:11:49 +00:00
Mark Felder
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
2021-06-01 16:53:32 -05:00
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
2021-06-01 16:17:43 -05:00
Alex Gleason
9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
2021-06-01 16:17:03 -05:00
feld
3fe6ada6fc
Merge branch 'cycles-streaming' into 'develop'
...
Recompilation speedup: Remove deps from Streaming/Persisting behaviors
See merge request pleroma/pleroma!3434
2021-06-01 19:41:37 +00:00
feld
dea035dc49
Merge branch 'cycles-uploader' into 'develop'
...
Recompilation speedup: Remove deps from Uploader behaviour
See merge request pleroma/pleroma!3435
2021-06-01 19:39:36 +00:00
Mark Felder
0be7eada92
Keep original Shoutbox channel name as chat:public
...
There is no sane / high level workaround for merging users who join shout:public and chat:public.
2021-06-01 14:34:13 -05:00
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
2021-06-01 14:20:31 -05:00