48827e1210
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream
...
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
Minor conflict due to glitch-soc's theming system.
2024-12-01 17:36:49 +01:00
74df47ad9c
Add coverage for `Webhook` validations ( #33026 )
2024-11-25 08:19:16 +00:00
ab9c62e8c7
Add coverage for `User` validations ( #33028 )
2024-11-25 08:18:10 +00:00
fd90f04f0e
Add coverage for `UserRole` validations ( #33029 )
2024-11-25 08:18:07 +00:00
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
b66fbaeec2
Add `AccountWarning` case to `Report#history` spec ( #32984 )
2024-11-20 07:52:00 +00:00
2b5faa2ba3
Change lists to reflect added and removed users retroactively ( #32930 )
2024-11-19 10:04:12 +00:00
87e7ad9b8f
Add `LoginActivity` model spec and `BrowserDetection` concern shared example ( #32959 )
2024-11-19 09:15:05 +00:00
03ee08c2da
Use `nil` instead of `false` for datetime value in spec ( #32926 )
2024-11-18 09:31:25 +00:00
be413d67de
`Form::Import` spec reduce factories ( #32924 )
2024-11-18 09:22:09 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
319109029d
Fix logic in "last used at per application" oauth token list ( #32912 )
2024-11-15 15:52:37 +00:00
766358e52b
Add coverage for malformed version cleanup in `SoftwareUpdateCheckService`, add helper query methods ( #32876 )
2024-11-14 14:03:57 +00:00
8f5cbf5370
Fix list creation limit check ( #32869 )
2024-11-13 10:22:11 +00:00
884bbf7ae2
Prepare the way for banning a bunch of usernames ( #32856 )
2024-11-12 15:43:55 +00:00
5d9dde3ec0
Add age/expiry duration constants to `BulkImport` class ( #32839 )
2024-11-12 08:57:06 +00:00
c78dc23b49
Move account sensitize-related methods to concern ( #28865 )
2024-11-11 13:08:23 +00:00
d033920b7e
Move account silence-related methods to concern ( #28866 )
2024-11-11 08:29:55 +00:00
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
2bea74e69d
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-11-06 10:51:54 +00:00
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
a20ac20302
Add model spec for `Tombstone` ( #32697 )
2024-10-31 13:27:47 +00:00
babee06794
Add coverage for `StatusTrend` and `PreviewCardTrend` models, add `locales` class method to `RankedTrend` ( #32688 )
2024-10-29 15:46:32 +00:00
1edb527072
Enhance coverage for `StatusPin` model ( #32515 )
2024-10-28 07:34:58 +00:00
9074c1fac9
Use `likes` and `shares` totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
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
1775e151ec
Simplify model validation specs for `DomainAllow` ( #32496 )
2024-10-25 08:42:14 +00:00
9464281f29
Simplify model validation specs for `AccountStatusCleanupPolicy` ( #32495 )
2024-10-25 08:41:24 +00:00
15f6336cdd
Simplify model validation specs for `AccountMigration` ( #32494 )
2024-10-25 08:02:13 +00:00
86132f7dd3
Provide `establish_policy` helper method in `AccountStatusesCleanupPolicy` spec ( #32490 )
2024-10-25 08:00:58 +00:00
2e3bbb6861
Move account suspension related coverage to concern spec ( #32432 )
2024-10-25 07:58:41 +00:00
4134ccdbe0
Simplify model validation specs for `WebauthnCredential` ( #32466 )
2024-10-25 07:55:45 +00:00
e5be4bf8d8
Simplify model validation specs for `PreviewCard` ( #32469 )
2024-10-25 07:55:33 +00:00
37bcbeab4a
Simplify model validation spec in AccountModerationNote/ReportNote ( #31792 )
2024-10-24 12:52:38 +00:00
dea6c454fd
Contribute more coverage for `Account` model ( #32474 )
2024-10-24 12:47:06 +00:00
b16435e79f
Explore more resplendent model validation specs for `Form::AdminSettings` ( #32465 )
2024-10-24 12:44:13 +00:00
67504dbf9c
Simplify uniqueness validation spec for `IpBlock` ( #32066 )
2024-10-24 12:43:40 +00:00
2f906ed55a
Constants for account refresh ( #32420 )
2024-10-23 13:29:01 +00:00
bd0c826a3d
Simplify model validation specs for `Announcement` ( #32481 )
2024-10-23 07:47:46 +00:00
c0f46e9031
Fortify coverage for `Follow` model ( #32472 )
2024-10-23 07:46:55 +00:00
1f3722904f
Top off coverage for `Appeal` model ( #32464 )
2024-10-23 06:42:57 +00:00
6d2f865862
Add coverage for `AccountAlias` validations ( #31936 )
2024-10-23 06:39:19 +00: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
27f05e9016
Expand coverage for `User#token_for_app` ( #32434 )
2024-10-15 13:43:08 +00:00
bfb41e61a3
Expand coverage for `Block` model ( #32480 )
2024-10-15 13:30:17 +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
d74c2c583a
Extend spec coverage for `Poll` model ( #32500 )
2024-10-15 12:48:10 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
cc70acc11c
Augment coverage for `Status` model ( #32468 )
2024-10-14 12:52:47 +00:00
Claire