67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
8156113d58
Use `response_vary_headers` method in requests/cache_spec ( #29411 )
2024-02-26 16:27:07 +00:00
1540f42522
Better tests for auth/registrations#update ( #29303 )
2024-02-26 16:09:56 +00:00
d51c3ac087
Add a missing spec to `SessionsController#webauthn_options` ( #29277 )
2024-02-26 16:09:40 +00:00
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
1ad91dece8
Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes applied to `app/javascript/core/admin.js` instead.
2024-02-24 15:35:56 +01:00
7901dc9e24
Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 15:33:36 +01:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
73de36318e
Move `api/v1/timelines/direct` to request spec
2024-02-24 14:10:05 +01:00
9903e6beab
Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
`spec/controllers/api/v1/timelines` has been renamed, but we had an extra
spec here for a glitch-soc-only endpoint.
Kept glitch-soc's file unchanged (will port to a request spec later).
2024-02-24 14:05:26 +01:00
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
b0064ddda7
Add basic coverage for `MoveService` class ( #29301 )
2024-02-23 09:59:29 +00:00
9d8dfeb5fb
Fix processing of `Link` objects in `Image` objects ( #29335 )
2024-02-22 22:27:24 +01:00
a6ed148769
Use heredoc on the `HTML` blocks in verify link spec ( #29365 )
2024-02-22 21:26:48 +00:00
10a0d76bf0
Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different handling for
the character limit.
Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different limits for
option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
f25414014a
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 20:45:40 +01:00
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
5152dd869e
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 17:31:50 +00:00
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00:00
e9b0f0c314
Add basic coverage for `RemoveDomainsFromFollowersService` class ( #29327 )
2024-02-22 10:53:38 +00:00
7c7dfe7de3
Add basic coverage for `RemoveFeaturedTagService` class ( #29328 )
2024-02-22 10:51:04 +00:00
6342ddd698
Add basic coverage for `UnfavouriteService` class ( #29329 )
2024-02-22 10:48:42 +00:00
f70905f127
Add basic coverage for `UnmuteService` class ( #29330 )
2024-02-22 10:48:09 +00:00
a69fe534e3
Add basic coverage for `WebhookService` class ( #29331 )
2024-02-22 10:46:20 +00:00
d1602c017d
Add basic coverage for `ApproveAppealService` class ( #29333 )
2024-02-22 10:40:07 +00:00
ab2ef63a03
Add basic coverage for `VoteService` class ( #29334 )
2024-02-22 10:39:18 +00:00
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-21 17:45:06 +00:00
08342ad40c
Add basic coverage for `AfterUnallowDomainService` class ( #29324 )
2024-02-21 17:13:11 +00:00
8f61e32569
Add basic coverage for `AppealService` class ( #29322 )
2024-02-21 17:12:31 +00:00
b73932461f
Add basic coverage for `CreateFeaturedTagService` class ( #29321 )
2024-02-21 16:58:19 +00:00
5f19e7e799
Add basic coverage for `ProcessHashtagsService` class ( #29320 )
2024-02-21 16:57:45 +00:00
1f648fdf1a
Remove erroneous service type on `TagFeed` model spec ( #29302 )
2024-02-21 11:25:33 +00:00
64f9939e39
Use `capture_emails` helper to improve email assertions in specs ( #29245 )
2024-02-19 15:57:47 +00:00
86627ea2e4
Add a missing thread example to the statuses spec ( #29278 )
2024-02-19 13:35:58 +00:00
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
96ddf1d482
Fix flaky end-to-end OCR test ( #29244 )
2024-02-16 16:57:23 +00:00
1946e171e6
Reduce round trips in admin/disputes/appeals spec ( #29234 )
2024-02-16 13:46:28 +00:00
3454fcbd71
Reduce round trips in auth/sessions spec ( #29233 )
2024-02-16 13:38:49 +00:00
a316c0e38d
Reduce round trips in disputes/appeals spec ( #29232 )
2024-02-16 13:01:15 +00:00
117b507df5
Extract `subject` from `User#mark_email_as_confirmed!` spec ( #29231 )
2024-02-16 13:01:04 +00:00
1690fb39e6
Reduce `RSpec/MultipleExpectations` in instance_actors_controller spec ( #29229 )
2024-02-16 13:00:11 +00:00
bba488c189
Reduce `RSpec/MultipleExpectations` in media_attachment spec ( #29228 )
2024-02-16 13:00:09 +00:00
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 11:56:12 +01:00
a9f9b0097b
Reduce `RSpec/MultipleExpectations` in captcha feature spec ( #29226 )
2024-02-16 07:52:57 +00:00
Claire