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
d8eab3d81f
Reinforce coverage for `DomainBlock` model ( #32473 )
2024-10-14 12:51:01 +00:00
d9fbb071da
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-09 17:29:02 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
d95f6f4410
Extract `ExportSummary` class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
2151dfb8d6
Add `relevant_params` to ReportFilter (matches account filter) ( #32136 )
2024-10-02 13:24:40 +00:00
ebab3b80c7
Expand coverage for `Export` utility class ( #32212 )
2024-10-02 09:43:04 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
bbf7752256
Combine assertions in `Notification` model spec ( #32015 )
2024-09-23 10:45:34 +00:00
cd7b670cd8
Reduce factory creation in `User#reset_password!` spec ( #32021 )
2024-09-23 09:18:04 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
04a939d640
Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern ( #31988 )
2024-09-20 08:51:37 +00:00
6801afa12f
Update dependency devise-two-factor to v6 [SECURITY] ( #31957 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <david@roetzel.de>
2024-09-19 10:56:09 +00:00
e3baa1cdda
Add coverage for `AccountDeletionRequest` class ( #31937 )
2024-09-18 13:29:57 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
c54cbf7943
Remove `follow` creation from `ListAccount` fabricator ( #31902 )
2024-09-16 08:56:40 +00:00
abd2f5654a
Add validation coverage for `CustomEmoji` shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
822e918a56
Add coverage for `Bookmark` validation and reblog/status check callback ( #31907 )
2024-09-16 07:52:22 +00:00
Claire