Jeremy Kescher
a38cc7ec83
Merge branch 'upstream-main' into develop
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 / build (production) (push) Has been cancelled
Ruby Testing / build (test) (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-17 00:02:19 +01:00
Claire
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
Matt Jankowski
9d3fcc3546
Remove unused failure action in api/base controller spec ( #32905 )
2024-11-15 16:10:20 +00:00
Matt Jankowski
7bd7705f59
Combine shared-setup examples across spec/controllers/auth/* specs ( #32906 )
2024-11-15 16:07:26 +00:00
Matt Jankowski
319109029d
Fix logic in "last used at per application" oauth token list ( #32912 )
2024-11-15 15:52:37 +00:00
Matt Jankowski
297ce9ef44
Move body class to shared partial for web app controller concern views ( #31797 )
2024-11-15 15:49:26 +00:00
Claire
f1ef7b5b43
Fix uploading higher-than-wide GIF profile picture with libvips enabled ( #32911 )
2024-11-15 15:35:30 +00:00
Matt Jankowski
766358e52b
Add coverage for malformed version cleanup in SoftwareUpdateCheckService, add helper query methods ( #32876 )
2024-11-14 14:03:57 +00:00
Matt Jankowski
62d65504f6
Add DomainResource class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
Claire
e8b6607ece
Fix titles being escaped twice ( #32889 )
2024-11-14 13:28:00 +00:00
Claire
8f5cbf5370
Fix list creation limit check ( #32869 )
2024-11-13 10:22:11 +00:00
Matt Jankowski
a6d829e86f
Fix error in CLI EmailDomainBlocks when supplying --with-dns-records ( #32863 )
2024-11-13 08:39:58 +00:00
Emelia Smith
2bd56f726a
Add client_secret_expires_at to OAuth Applications ( #30317 )
2024-11-12 22:06:13 +00:00
Matt Jankowski
884bbf7ae2
Prepare the way for banning a bunch of usernames ( #32856 )
2024-11-12 15:43:55 +00:00
Matt Jankowski
5d9dde3ec0
Add age/expiry duration constants to BulkImport class ( #32839 )
2024-11-12 08:57:06 +00:00
Matt Jankowski
c099797700
Use mastodon config namespace to load software update default value via config_for ( #30534 )
2024-11-12 08:28:31 +00:00
Matt Jankowski
c78dc23b49
Move account sensitize-related methods to concern ( #28865 )
2024-11-11 13:08:23 +00:00
Matt Jankowski
d033920b7e
Move account silence-related methods to concern ( #28866 )
2024-11-11 08:29:55 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
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
Matt Jankowski
4ef3a1a38d
Match dependency-generator output for require_relative usage ( #32800 )
2024-11-08 09:55:15 +00:00
Matt Jankowski
870bb06994
Add coverage for misc serializers ( #32781 )
2024-11-07 15:37:26 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +00:00
Claire
2bea74e69d
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-11-06 10:51:54 +00:00
Eugen Rochko
90f4ffa31d
Fix performance of percentile calculation for annual reports ( #32765 )
2024-11-04 10:11:06 +00:00
Matt Jankowski
ff490daa58
Reduce factory generation in AccountStatusesFilter spec ( #32727 )
2024-11-04 09:00:01 +00: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
