b58bc7102e
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-11-01 17:03:17 +01:00
Claire
39fb314421
Merge pull request #2888 from ClearlyClaire/glitch-soc/backports-4.3
...
Backports upstream changes to glitch-soc (stable 4.3)
2024-10-21 11:13:51 +02:00
Claire
90f6984ff1
Merge tag 'v4.3.1' into glitch-soc/backports-4.3
2024-10-21 11:06:25 +02:00
Claire
9adb96f3a1
Bump version to v4.3.1 ( #32582 )
...
Co-authored-by: David Roetzel <david@roetzel.de>
2024-10-21 10:58:01 +02:00
Claire
d5a3478864
Merge pull request #2886 from ClearlyClaire/glitch-soc/backports-4.3
...
Merge upstream changes up to f7aab0cc2f
(stable-4.3)
2024-10-19 19:14:05 +02:00
Claire
9877a053f6
[Glitch] Remove ability to get embed code for remote posts
...
Port de5f522cc0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-18 17:30:47 +02:00
hota
605ed50603
[Glitch] Fix column-settings spacing in local timeline in advanced view
...
Port 044dd3f788
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-18 17:30:18 +02:00
Claire
e1609c6813
[Glitch] Add more explicit explanations about author attribution and fediverse:creator
...
Port 7388a6ce9a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-18 17:27:57 +02:00
Renaud Chaput
de5d6e98ae
[Glitch] Add ability to group follow notifications in WebUI
...
Port e507b4f884
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-18 17:27:12 +02:00
Claire
2b0410f903
Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-18 17:19:57 +02:00
Claire
f7aab0cc2f
Update changelog
2024-10-18 15:49:26 +02:00
Claire
de5f522cc0
Remove ability to get embed code for remote posts ( #32578 )
2024-10-18 15:49:26 +02:00
Claire
d728fa9991
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 15:49:26 +02:00
hota
044dd3f788
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 15:49:26 +02:00
Matt Jankowski
afc440435c
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 15:49:26 +02:00
github-actions[bot]
d0fb7939bb
New Crowdin Translations for stable-4.3 (automated) ( #32576 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-18 10:11:59 +02:00
Claire
7388a6ce9a
Add more explicit explanations about author attribution and fediverse:creator
( #32383 )
2024-10-18 09:14:13 +02:00
Emelia Smith
cd2a3bac79
Fix missing or incorrect cache-control headers for Streaming server ( #32551 )
2024-10-18 09:14:13 +02:00
Matt Jankowski
f0e011fbc9
Fix trailing slash newline in changelog ( #32545 )
2024-10-18 09:14:13 +02:00
Matt Jankowski
acbc273d6e
Update rails to version 7.1.4.1 ( #32542 )
2024-10-18 09:14:13 +02:00
Claire
1f0c84749d
Change Active Record Encryption variable check to check for emptiness ( #32537 )
2024-10-18 09:14:13 +02:00
Renaud Chaput
e507b4f884
Add ability to group follow notifications in WebUI ( #32520 )
2024-10-18 09:14:13 +02:00
github-actions[bot]
93348136a5
New Crowdin Translations for stable-4.3 (automated) ( #32555 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-17 10:21:47 +02:00
Claire
3a5e83b91a
Merge pull request #2885 from ClearlyClaire/glitch-soc/backports-4.3
...
Merge upstream changes (stable-4.3)
2024-10-16 19:56:45 +02:00
Claire
8d37565c19
[Glitch] Fix only the first paragraph being displayed in some notifications
...
Port 82dd6cd96ef42dc9fdf6f68398d46344ba0e9884 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-16 12:45:06 +02:00
Renaud Chaput
177e8fe972
[Glitch] Add back a 6 hours mute duration option
...
Port d73b5e2ced6c50f2410fbd724394254c792172ad to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-16 12:44:43 +02:00
Claire
198283a188
Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while
glitch-soc has a different version of the file overall.
Added upstream's changes.
2024-10-16 12:42:12 +02:00
Claire
36452845d7
Explicitly install ImageMagick in CI (except for libvips tests) ( #32534 )
2024-10-16 12:40:58 +02:00
Christian Winther
5c4bcd2f08
Run migration tests against postgres 16 and 17 as well ( #32416 )
2024-10-16 12:40:58 +02:00
Claire
a20f38c930
Fix only the first paragraph being displayed in some notifications ( #32348 )
2024-10-16 12:40:58 +02:00
Renaud Chaput
b01bd74698
Add back a 6 hours mute duration option ( #32522 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
41e342a88f
Convert admin/invites
controller specs to system specs ( #32450 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
9258ee8847
Improve app/policies
coverage ( #32426 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
6d72c13a4d
Convert status embed controller to request spec ( #32448 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
ad4be12473
Add mention of encryption secrets to production sample ( #32512 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
527d1253bf
Reduce factory creation (14 -> 8) in ActivityPub::Activity::Block
spec ( #32488 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
ae676edc2b
Expand coverage for User#token_for_app
( #32434 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
63df649fe5
Expand coverage for Block
model ( #32480 )
2024-10-16 12:40:58 +02:00
Christian Schmidt
0ff427fab3
Translate to regional language variant (e.g. pt-BR) ( #32428 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
dc2f9eef77
Reduce factories (36 > 12) in AccountReachFinder
spec ( #32482 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
ff1247ad16
Use context
for repeated scenarios in AccountStatusCleanupPolicy
spec ( #32489 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
fbe55a4545
Reduce factory creation (73 -> 64) in PublicFeed
spec ( #32491 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
a72819660a
Reduce factory creation (48 -> 8) in AP::Note
serializer spec ( #32492 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
c292ed07fe
Expand coverage for Scheduler::IpCleanupScheduler
worker ( #32499 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
2d008108a4
Reduce factory creation (132 -> 40) in lib/vacuum/* specs ( #32498 )
2024-10-16 12:40:58 +02:00
Matt Jankowski
0c59ef44b1
Extend spec coverage for Poll
model ( #32500 )
2024-10-16 12:40:58 +02:00
Jeong Arm
12297faa1d
[Glitch] Fix reblog icons on account media view
...
Port 49b3d5692e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-15 17:49:40 +02:00
Claire
9b6f92e47f
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts, for real
...
Port 70472de726
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-15 17:49:40 +02:00
Renaud Chaput
8b6247ca44
[Glitch] Fix back arrow pointing to the incorrect direction in RTL languages
...
Port ca68a3cacb
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-15 17:49:40 +02:00
Claire
836cbca469
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts
...
Port a2e24ee2de
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-15 17:49:20 +02:00