Jeremy Kescher
c9f7e9454c
Merge branch 'upstream-main' into develop
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-08 14:46:42 +01:00
Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +01:00
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 ( #32363 )
2024-10-31 15:12:08 +00:00
Matt Jankowski
a20ac20302
Add model spec for Tombstone ( #32697 )
2024-10-31 13:27:47 +00:00
Eugen Rochko
c2b498a2b0
Fix IDs not being serialized as strings in annual reports API ( #32710 )
2024-10-31 09:38:00 +00:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint ( #32548 )
2024-10-30 14:38:10 +00:00
Matt Jankowski
babee06794
Add coverage for StatusTrend and PreviewCardTrend models, add locales class method to RankedTrend ( #32688 )
2024-10-29 15:46:32 +00:00
Matt Jankowski
df3b954720
Add DomainHelpers spec support module for DNS/MX stub ( #32690 )
2024-10-29 15:35:25 +00:00
Emelia Smith
d94a367aeb
Add test coverage for POST /api/v2/media's max description length ( #32683 )
2024-10-29 09:25:38 +00:00
Matt Jankowski
b107fc2e65
Use nil for timestamp column in admin/confirmations spec ( #32682 )
2024-10-29 08:54:30 +00:00
Matt Jankowski
1edb527072
Enhance coverage for StatusPin model ( #32515 )
2024-10-28 07:34:58 +00:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
Matt Jankowski
1775e151ec
Simplify model validation specs for DomainAllow ( #32496 )
2024-10-25 08:42:14 +00:00
Matt Jankowski
9464281f29
Simplify model validation specs for AccountStatusCleanupPolicy ( #32495 )
2024-10-25 08:41:24 +00:00
Matt Jankowski
15f6336cdd
Simplify model validation specs for AccountMigration ( #32494 )
2024-10-25 08:02:13 +00:00
Matt Jankowski
86132f7dd3
Provide establish_policy helper method in AccountStatusesCleanupPolicy spec ( #32490 )
2024-10-25 08:00:58 +00:00
Matt Jankowski
2a13d6824c
Use subject for FeedManager lib spec ( #32486 )
2024-10-25 07:59:31 +00:00
Matt Jankowski
2e3bbb6861
Move account suspension related coverage to concern spec ( #32432 )
2024-10-25 07:58:41 +00:00
Matt Jankowski
4134ccdbe0
Simplify model validation specs for WebauthnCredential ( #32466 )
2024-10-25 07:55:45 +00:00
Matt Jankowski
e5be4bf8d8
Simplify model validation specs for PreviewCard ( #32469 )
2024-10-25 07:55:33 +00:00
Matt Jankowski
37bcbeab4a
Simplify model validation spec in AccountModerationNote/ReportNote ( #31792 )
2024-10-24 12:52:38 +00:00
Matt Jankowski
dea6c454fd
Contribute more coverage for Account model ( #32474 )
2024-10-24 12:47:06 +00:00
Matt Jankowski
b16435e79f
Explore more resplendent model validation specs for Form::AdminSettings ( #32465 )
2024-10-24 12:44:13 +00:00
Matt Jankowski
67504dbf9c
Simplify uniqueness validation spec for IpBlock ( #32066 )
2024-10-24 12:43:40 +00:00
Matt Jankowski
5c910dc82e
Add coverage for DatabaseHelper primary/replica methods ( #32642 )
2024-10-24 08:04:29 +00:00
Matt Jankowski
745c4f900a
Remove unused ApplicationHelper#visibility_icon helper method ( #32644 )
2024-10-24 08:02:54 +00:00
Matt Jankowski
5a4f4f3e83
Remove single-use ProfileStories method ( #31164 )
2024-10-23 13:31:03 +00:00
Matt Jankowski
2f906ed55a
Constants for account refresh ( #32420 )
2024-10-23 13:29:01 +00:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Matt Jankowski
d1b20ea8f7
Worker specs coverage increase ( #32541 )
2024-10-23 07:50:20 +00:00
Matt Jankowski
bd0c826a3d
Simplify model validation specs for Announcement ( #32481 )
2024-10-23 07:47:46 +00:00
Matt Jankowski
c0f46e9031
Fortify coverage for Follow model ( #32472 )
2024-10-23 07:46:55 +00:00
Matt Jankowski
1f3722904f
Top off coverage for Appeal model ( #32464 )
2024-10-23 06:42:57 +00:00
Matt Jankowski
67403e7b01
Add coverage for ActivityPub likes/shares endpoints ( #32305 )
2024-10-23 06:41:07 +00:00
Matt Jankowski
0a4a73f9a6
Add coverage for api/v1/domain_blocks/preview endpoint ( #32303 )
2024-10-23 06:40:29 +00:00
Matt Jankowski
6d2f865862
Add coverage for AccountAlias validations ( #31936 )
2024-10-23 06:39:19 +00:00
Claire
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
Matt Jankowski
bfe3d49cca
Add inline_jobs to admin/reset spec ( #32517 )
2024-10-16 08:06:34 +00:00
Matt Jankowski
c40cd79c4d
Convert admin/invites controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
Matt Jankowski
9e8f099d38
Improve app/policies coverage ( #32426 )
2024-10-15 14:24:12 +00:00
Matt Jankowski
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
Matt Jankowski
b78597979a
Fix missing content warning text in rss formatter ( #32406 )
2024-10-15 14:12:54 +00:00
Matt Jankowski
b742ce9d09
Reduce factory creation (17 -> 0) in PlainTextFormatter spec ( #32487 )
2024-10-15 13:58:45 +00:00
Matt Jankowski
e9b27852be
Reduce factory creation (14 -> 8) in ActivityPub::Activity::Block spec ( #32488 )
2024-10-15 13:51:52 +00:00
Matt Jankowski
27f05e9016
Expand coverage for User#token_for_app ( #32434 )
2024-10-15 13:43:08 +00:00
Matt Jankowski
bfb41e61a3
Expand coverage for Block model ( #32480 )
2024-10-15 13:30:17 +00:00
Christian Schmidt
227d46883f
Translate to regional language variant (e.g. pt-BR) ( #32428 )
2024-10-15 13:26:20 +00:00
Matt Jankowski
6a39212b02
Reduce factories (36 > 12) in AccountReachFinder spec ( #32482 )
2024-10-15 13:18:57 +00:00
