lain
95bcd5d28f
Merge branch 'force-mention' into 'develop'
...
Add ForceMention mrf
See merge request pleroma/pleroma!4082
2024-03-17 12:32:14 +00:00
feld
0b5bba23ce
Merge branch 'backups' into 'develop'
...
Include following/followers in backups
See merge request pleroma/pleroma!4085
2024-03-15 19:32:35 +00:00
marcin mikołajczak
bb0b17f4d9
Include following/followers in backups
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-10 23:53:12 +01:00
tusooa
df7a8d4efe
Merge branch 'instance-contact-account' into 'develop'
...
Add contact account to InstanceView
See merge request pleroma/pleroma!3960
2024-03-10 13:14:19 +00:00
feld
72daf522c9
Merge branch 'fix-framegrabs' into 'develop'
...
Fix ffmpeg framegrabs with Exile
See merge request pleroma/pleroma!4087
2024-03-08 14:48:26 +00:00
marcin mikołajczak
c0c4a9ed0d
Merge remote-tracking branch 'origin/develop' into instance-contact-account
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-08 12:12:55 +01:00
tusooa
139057f346
Merge branch 'link-verification' into 'develop'
...
Verify profile link ownership with rel="me"
Closes #2733
See merge request pleroma/pleroma!3959
2024-03-08 00:52:09 +00:00
Mark Felder
54ff7234b9
Fix ffmpeg framegrabs with Exile
2024-03-07 17:38:21 -05:00
marcin mikołajczak
961a5dd4cd
Add test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-07 16:42:22 +01:00
marcin mikołajczak
b7c625db0f
Merge remote-tracking branch 'origin/develop' into link-verification
2024-03-07 13:13:49 +01:00
tusooa
47ce33a90d
Apply tusooa's suggestion
2024-03-07 11:55:31 +00:00
tusooa
8298b326a7
Merge branch 'instance-v2' into 'develop'
...
Add some missing fields to instanceV2
See merge request pleroma/pleroma!4081
2024-03-07 01:31:27 +00:00
marcin mikołajczak
9cfa4e67b1
Add ForceMention mrf
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-01 18:16:09 +01:00
marcin mikołajczak
acb9e46074
Add some missing fields to instanceV2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-27 13:25:26 +01:00
Haelwenn
03e54aaba9
Merge branch 'remote-fetcher-error' into 'develop'
...
RemoteFetcherWorker: Make sure {:error, _} is returned on failure
See merge request pleroma/pleroma!4077
2024-02-24 11:37:34 +00:00
feld
bd4d2e1d83
Merge branch 'exile-freebsd' into 'develop'
...
Exile: change to upstream pre-release commit that fixes build on FreeBSD
See merge request pleroma/pleroma!4079
2024-02-23 20:52:04 +00:00
Mark Felder
267e20dbcd
Exile: change to upstream pre-release commit that fixes build on FreeBSD
2024-02-23 15:36:37 -05:00
feld
6144cb43a8
Merge branch 'gun-pool-retry' into 'develop'
...
Gun connection pooling: rename variable for clarity
See merge request pleroma/pleroma!4078
2024-02-23 16:44:53 +00:00
Mark Felder
f4e48bc53e
Rename variable to make the worker retry logic easier to read
...
The boolean value matches the intent of the "last_attempt" variable name now
2024-02-23 11:12:10 -05:00
Haelwenn
00e828b1a0
Merge branch 'gun-pool-retry' into 'develop'
...
Gun connection pool retry fix
See merge request pleroma/pleroma!4076
2024-02-23 06:47:56 +00:00
Haelwenn (lanodan) Monnier
6af6a9704d
RemoteFetcherWorker: Make sure {:error, _} is returned on failure
...
Otherwise jobs are considered a success.
2024-02-23 01:59:30 +01:00
Mark Felder
72fc41d891
Prevent publisher jobs from erroring if the connection pool is full
...
A full pool is a soft-error. Snooze the job for 30 seconds and try again.
2024-02-22 14:14:40 -05:00
Mark Felder
ac55764599
Gun Connection Pool was not attempting to free a connection and retry once if the pool was full.
2024-02-22 14:07:46 -05:00
Haelwenn
f0468697cd
Merge branch 'mergeback/2.6.2' into 'develop'
...
Mergeback: Security Release 2.6.2
Closes #3245
See merge request pleroma/pleroma!4075
2024-02-20 10:52:46 +00:00
Haelwenn (lanodan) Monnier
e149ee6e22
Mergeback of security release 2.6.2
2024-02-20 09:34:11 +01:00
Haelwenn (lanodan) Monnier
7d624c4750
StealEmojiPolicy: Sanitize shortcodes
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3245
2024-02-20 09:09:54 +01:00
feld
0b9bc4a0d0
Merge branch 'memleak' into 'develop'
...
Force more frequent full_sweep GC runs on the Websocket processes
See merge request pleroma/pleroma!4060
2024-02-17 16:21:55 +00:00
Mark Felder
7e99d0619d
Force more frequent full_sweep GC runs on the Websocket processes
...
Websocket processes seem to be the primary culprit for Binary memory allocation bloat.
2024-02-17 09:53:52 -05:00
Haelwenn
a145d909b5
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!4070
2024-02-16 18:28:55 +00:00
SyoBoN
2c9fed9b73
Translated using Weblate (Japanese)
...
Currently translated at 63.1% (60 of 95 strings)
Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/ja/
2024-02-16 17:54:01 +00:00
feld
0fbec6b532
Merge branch 'deps-changelog-revert' into 'develop'
...
Revert "Support a new changelog entry type: deps"
See merge request pleroma/pleroma!4071
2024-02-16 17:53:52 +00:00
Mark Felder
1951d56ed9
Revert "Add support for a "deps" changelog type and document deps changes since 2.6.1 release"
...
This reverts commit 2a4fa4c408
.
2024-02-16 12:53:18 -05:00
Mark Felder
c9cd449bba
Revert "Support a new changelog entry type: deps"
...
This reverts commit 4648997a10
.
2024-02-16 12:52:56 -05:00
feld
03834454d9
Merge branch 'tesla' into 'develop'
...
Update Tesla, document some deps changes
See merge request pleroma/pleroma!4069
2024-02-15 15:27:34 +00:00
Mark Felder
2a4fa4c408
Add support for a "deps" changelog type and document deps changes since 2.6.1 release
2024-02-15 10:27:13 -05:00
Mark Felder
772f8d08cf
Tesla changelog
2024-02-15 10:24:32 -05:00
Mark Felder
4648997a10
Support a new changelog entry type: deps
2024-02-15 10:24:31 -05:00
feld
b91317b9bf
Merge branch 'bandit' into 'develop'
...
Support Bandit as a Phoenix HTTP adapter
See merge request pleroma/pleroma!4068
2024-02-15 15:23:41 +00:00
Mark Felder
202721e80c
Remove Cowboy-specific HTTP options
...
These were only used in dev and served no specific purpose. The equivalent settings for Bandit are under a key called :http1_options and the default values are set to 10_000.
2024-02-15 09:55:03 -05:00
Mark Felder
0c5bec0493
Support Bandit as an alternate HTTP backend to Cowboy. This is currently considered experimental, but may improve performance and resource usage.
2024-02-15 09:54:52 -05:00
feld
4dd8a1a1ca
Merge branch 'websocket-refactor' into 'develop'
...
Websocket refactor to use Phoenix.Socket.Transport
See merge request pleroma/pleroma!4064
2024-02-15 14:36:54 +00:00
lain
d3208d2250
Merge branch 'oauth-nickname' into 'develop'
...
Use User.full_nickname/1 in oauth html template
See merge request pleroma/pleroma!4054
2024-02-15 09:35:39 +00:00
lain
f2f455f283
Merge branch 'frontend-caching' into 'develop'
...
FrontendStatic should have reasonable caching
See merge request pleroma/pleroma!3685
2024-02-15 09:23:47 +00:00
Haelwenn
f28dcc9cb7
Merge branch 'config-stat-symlink' into 'develop'
...
Config: Check the permissions of the linked file instead of the symlink
See merge request pleroma/pleroma!4061
2024-02-15 01:48:03 +00:00
Haelwenn
d19642d7eb
Merge branch 'bugfix-ccworks' into 'develop'
...
Bugfix for ccworks AP bridge
Closes #3234
See merge request pleroma/pleroma!4043
2024-02-15 01:30:22 +00:00
feld
802c618885
Merge branch 'atom-leaks' into 'develop'
...
Fix minor atom leaks
See merge request pleroma/pleroma!4065
2024-02-14 23:28:00 +00:00
Mark Felder
9138754b0a
Changelog
2024-02-14 18:04:39 -05:00
Mark Felder
91c83a82a0
Fix atom leak in background worker
...
The only permitted values are "blocks_import", "follow_import", "mutes_import" of which we already have the equivalent atoms defined.
2024-02-14 18:03:54 -05:00
Mark Felder
86e6d395d9
Fix atom leak in password digest functionality
...
The value here gets passesd to :crypto.pbkdf2_hmac and it expects one of these atoms: :sha | :sha224 | :sha256 | :sha384 | :sha512 so it will always exist
2024-02-14 17:54:56 -05:00
Mark Felder
6be129ead2
Websocket refactor changelog
2024-02-14 15:27:12 -05:00