075a4492f7
Merge pull request #2887 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 1fc165de02
2024-10-19 22:08:41 +02:00
ba365ac8ec
[Glitch] Fix: Reword 'pick one' to 'single choice' for polls
...
Port bc2e642272
2024-10-19 19:27:27 +02:00
6bd185b423
[Glitch] Remove ability to get embed code for remote posts
...
Port 1fc165de02
2024-10-19 19:23:56 +02:00
f0207d10be
[Glitch] Fix column-settings spacing in local timeline in advanced view
...
Port 0f37b7d6ac
2024-10-19 19:23:56 +02:00
b428921ec9
[Glitch] Add more explicit explanations about author attribution and `fediverse:creator`
...
Port 8b56509625
2024-10-19 19:23:56 +02:00
829ff8633b
[Glitch] Add ability to group follow notifications in WebUI
...
Port 6c87c76e18
2024-10-19 19:23:56 +02:00
42336d810b
[Glitch] Fix only the first paragraph being displayed in some notifications
...
Port 25f8003d75
2024-10-19 19:23:56 +02:00
2f854c5576
[Glitch] Add back a 6 hours mute duration option
...
Port 7a7a7cc448
2024-10-19 19:23:56 +02:00
e35ee2ce5c
[Glitch] Fix reblog icons on account media view
...
Port 5afdb81b36
2024-10-19 19:23:56 +02:00
886a422d09
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts, for real
...
Port 5e4cc1a39c
2024-10-19 19:23:56 +02:00
d63594d97e
[Glitch] Fix back arrow pointing to the incorrect direction in RTL languages
...
Port 51345e5133
2024-10-19 19:23:52 +02:00
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
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.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
1fc165de02
Remove ability to get embed code for remote posts ( #32578 )
2024-10-18 10:51:05 +00:00
2391937e11
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 10:21:25 +00:00
8eae0d067d
New Crowdin Translations (automated) ( #32573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-18 07:56:43 +00:00
0f37b7d6ac
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 07:40:08 +00:00
bd6c96f737
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 07:19:37 +00:00
8b56509625
Add more explicit explanations about author attribution and `fediverse:creator` ( #32383 )
2024-10-17 09:03:08 +00:00
009f2ebc32
New Crowdin Translations (automated) ( #32553 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-17 08:21:51 +00:00
b23ff050ac
Fix missing or incorrect cache-control headers for Streaming server ( #32551 )
2024-10-17 08:17:18 +00:00
5103abc3ec
Fix trailing slash newline in changelog ( #32545 )
2024-10-17 07:22:13 +00:00
a0c7b317a7
Update rails to version 7.1.4.1 ( #32542 )
2024-10-16 12:52:06 +00:00
bc2e642272
Fix: Reword 'pick one' to 'single choice' for polls ( #32397 )
2024-10-16 10:40:40 +00:00
6ff1954bdb
Change Active Record Encryption variable check to check for emptiness ( #32537 )
2024-10-16 08:43:45 +00:00
6c87c76e18
Add ability to group follow notifications in WebUI ( #32520 )
2024-10-16 08:33:11 +00:00
acc1973f3a
New Crowdin Translations (automated) ( #32533 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-16 08:12:43 +00:00
bfe3d49cca
Add `inline_jobs` to admin/reset spec ( #32517 )
2024-10-16 08:06:34 +00:00
f8ba2122f8
Explicitly install ImageMagick in CI (except for libvips tests) ( #32534 )
2024-10-16 08:03:35 +00:00
5900c8c7fd
Run migration tests against postgres 16 and 17 as well ( #32416 )
2024-10-16 07:44:28 +00:00
25f8003d75
Fix only the first paragraph being displayed in some notifications ( #32348 )
2024-10-16 07:30:53 +00:00
7a7a7cc448
Add back a 6 hours mute duration option ( #32522 )
2024-10-16 07:27:44 +00:00
c40cd79c4d
Convert `admin/invites` controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
9e8f099d38
Improve `app/policies` coverage ( #32426 )
2024-10-15 14:24:12 +00:00
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
52bc33115d
Add mention of encryption secrets to production sample ( #32512 )
2024-10-15 14:14:17 +00:00
b78597979a
Fix missing content warning text in rss formatter ( #32406 )
2024-10-15 14:12:54 +00:00
b742ce9d09
Reduce factory creation (17 -> 0) in `PlainTextFormatter` spec ( #32487 )
2024-10-15 13:58:45 +00:00
92c8860451
Update babel monorepo to v7.25.8 ( #32391 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-15 13:58:33 +00:00
0e58dc90d9
Use array compact style for classes in `nothing_here` helper ( #32403 )
2024-10-15 13:56:29 +00:00
e9b27852be
Reduce factory creation (14 -> 8) in `ActivityPub::Activity::Block` spec ( #32488 )
2024-10-15 13:51:52 +00:00
27f05e9016
Expand coverage for `User#token_for_app` ( #32434 )
2024-10-15 13:43:08 +00:00
c772b41c36
Update dependency react-textarea-autosize to v8.5.4 ( #32401 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-15 13:38:48 +00:00
c19397b94a
Update formatjs monorepo ( #32304 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-15 13:38:02 +00:00
bfb41e61a3
Expand coverage for `Block` model ( #32480 )
2024-10-15 13:30:17 +00:00
227d46883f
Translate to regional language variant (e.g. pt-BR) ( #32428 )
2024-10-15 13:26:20 +00:00
6a39212b02
Reduce factories (36 > 12) in `AccountReachFinder` spec ( #32482 )
2024-10-15 13:18:57 +00:00
92bb19773a
Use `context` for repeated scenarios in `AccountStatusCleanupPolicy` spec ( #32489 )
2024-10-15 13:12:58 +00:00
d1d2278e70
Reduce factory creation (73 -> 64) in `PublicFeed` spec ( #32491 )
2024-10-15 13:10:29 +00:00
b1c10969ac
Reduce factory creation (48 -> 8) in `AP::Note` serializer spec ( #32492 )
2024-10-15 13:10:03 +00:00
a11b599ffa
Expand coverage for `Scheduler::IpCleanupScheduler` worker ( #32499 )
2024-10-15 13:09:25 +00:00
Claire