a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
8f3c91fc3c
Add `change` block expectation to `admin/invites#deactivate_all` spec ( #29412 )
2024-02-27 16:25:58 +00:00
6f7615ba86
Add basic end-to-end test for admin moderation interface ( #29424 )
2024-02-27 15:18:06 +00:00
9e78129e6e
Use "cacheable response" shared example in more places ( #29419 )
2024-02-27 11:50:21 +00:00
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
4b7f04e3ea
Reduce `RSpec/MultipleExpectations` in post_status_service spec ( #29225 )
2024-02-16 07:52:29 +00:00
ed4939296a
Reduce `RSpec/MultipleExpectations` in ap/activity/create spec ( #29224 )
2024-02-16 07:43:00 +00:00
1df2ffc3ee
Use `subject` in blacklist email validator spec ( #29211 )
2024-02-16 07:42:03 +00:00
fc4f823464
Avoid local block var assignment in ap/process_status_update_service spec ( #29210 )
2024-02-16 07:41:25 +00:00
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
bbbbf00084
Fix OmniAuth tests ( #29201 )
2024-02-14 14:57:49 +00:00
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
68eaa804c9
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:15:34 +01:00
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 18:11:47 +00:00
ca8fbda5d0
Add end-to-end test for OCR in media uploads ( #29148 )
2024-02-08 19:13:44 +00:00
a9e91eb955
Add common stub setup for resolv dns in email mx validator spec ( #29140 )
2024-02-08 14:26:45 +00:00
15437e4ad9
Add `context` and `before` to lengthy tag manager spec examples ( #29129 )
2024-02-08 10:03:04 +00:00
5271131658
Extract helper method for repeated form fill in admin/domain_blocks feature spec ( #29128 )
2024-02-08 10:02:53 +00:00
eff447a455
Rewrite signature verification using regexps and `StringScanner` ( #29133 )
2024-02-07 17:24:42 +00:00
95da28d201
Add common `ThreadingHelper` module for specs ( #29116 )
2024-02-07 14:53:29 +00:00
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
da50217b88
Combine repeated requests in `admin/accounts` controller spec ( #29119 )
2024-02-07 10:59:32 +00:00
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
0df86d77fd
Reduce `RSpec/ExampleLength` in PostStatusService spec example ( #29105 )
2024-02-06 14:36:04 +00:00
2d6ab44556
Reduce request/response round-trips in ap/collections controller spec ( #29102 )
2024-02-06 13:10:00 +00:00
978fdc71ca
Reduce expectation count in example from `ProcessAccountService` spec ( #29100 )
2024-02-06 13:04:02 +00:00
577520b637
Replace deprecated `Sidekiq::Testing` block style ( #29097 )
2024-02-06 12:49:48 +00:00
df7acdcee5
Update markers API spec for error case ( #29096 )
2024-02-06 12:47:04 +00:00
4fb7f611de
Return domain block digests from admin domain blocks API ( #29092 )
2024-02-06 12:38:14 +00:00
4cf07ed78c
Add missing action logging to `api/v1/admin/reports#update` ( #29044 )
2024-02-06 11:34:11 +00:00
66dda7c762
Fix already-invalid reports failing to resolve ( #29027 )
2024-02-06 09:35:27 +00:00
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
f4416e6b3a
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 11:15:23 +01:00
8b7b0ee598
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 09:46:31 +00:00
86fbde7b46
Fix `Style/NumericLiterals` cop in ProfileStories support module ( #28971 )
2024-01-30 15:38:33 +00:00
f91acba70a
Combine repeated requests in account controller concern spec ( #28957 )
2024-01-30 15:32:20 +00:00
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
ff8937aa2c
Move `api/v1/statuses/*` to request spec ( #28954 )
2024-01-26 17:45:54 +00:00
44f6d285af
Combine repeated subject in ap fetch remote actor service spec ( #28953 )
2024-01-26 17:44:12 +00:00
239244e2ed
Combine repeated subject in ap fetch remote account service spec ( #28952 )
2024-01-26 17:43:08 +00:00
5119fbc9b7
Move `api/v1/admin/trends/links/preview_card_providers` to request spec ( #28951 )
2024-01-26 17:41:39 +00:00
b6baab447d
Move `api/v2/admin/accounts` to request spec ( #28950 )
2024-01-26 17:41:13 +00:00
7adcc0aae3
Move `api/v1/trends/*` to request specs ( #28949 )
2024-01-26 17:40:39 +00:00
0b0ca6f3b8
Move `api/v1/timelines/list` to request spec ( #28948 )
2024-01-26 17:40:15 +00:00
e519f113e8
Combine repeated subject in `cacheable response` shared example ( #28945 )
2024-01-26 16:37:05 +00:00
d791bca11b
Combine double subject in `well_known/webfinger` shared example ( #28944 )
2024-01-26 16:36:21 +00:00
09a3493fca
Combine double subject in `api/v1/media` shared example ( #28943 )
2024-01-26 16:35:49 +00:00
5fbdb2055b
Combine repeated `subject` in `cli/accounts` spec shared example ( #28942 )
2024-01-26 16:35:19 +00:00
1a30a517d6
Combine repeated subjects in link details extractor spec ( #28941 )
2024-01-26 16:31:07 +00:00
685eaa04d4
Combine double subject in admin/statuses controller shared example ( #28940 )
2024-01-26 16:30:30 +00:00
beb74fd71c
Combine double subjects in instance actors controller shared example ( #28939 )
2024-01-26 16:28:50 +00:00
beaef4b672
Combine double subjects in application controller shared example ( #28938 )
2024-01-26 16:23:12 +00:00
6d35a77c92
Combine repeated subjects in `models/user` spec ( #28937 )
2024-01-26 16:22:44 +00:00
2f8656334d
Combine double subjects in `admin/accounts` controller spec ( #28936 )
2024-01-26 16:21:31 +00:00
9cc1817bb4
Fix intmermittent failure in `api/v1/accounts/statuses` controller spec ( #28931 )
2024-01-26 14:10:26 +00:00
0e0a94f483
Handle CLI failure exit status at the top-level script ( #28322 )
2024-01-26 08:53:44 +00:00
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
6936e5aa69
Change design of compose form in web UI ( #28119 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 15:41:31 +00:00
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` ( #28361 )
2024-01-25 13:37:25 +00:00
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
0471a78055
Add tests for redirect confirmations ( #28903 )
2024-01-25 11:13:33 +00:00
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
2024-01-24 10:31:31 +00:00
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
2024-01-23 09:10:11 +00:00
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
2024-01-19 12:43:10 +00:00
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope ( #28796 )
2024-01-18 15:57:10 +00:00
3d82040b26
Reduced repeated setup in `UnallowDomainService` spec ( #28785 )
2024-01-18 10:11:10 +00:00
6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec ( #28786 )
2024-01-18 10:07:49 +00:00
07e10e3747
Combine assertions about same setup in `Account#suspend!` spec ( #28787 )
2024-01-18 09:36:59 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
2024-01-17 13:38:37 +00:00
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
dee561604b
Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream
2024-01-15 22:37:21 +01:00
b4c332104a
Use top-level `warn` in JS errors check ( #28745 )
2024-01-15 21:26:11 +00:00
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author ( #18482 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
df9e220364
Add JS console errors check ( #28682 )
2024-01-12 09:12:31 +00:00
cd37048439
Move followable_by coverage to suggestions ( #28697 )
2024-01-12 09:11:34 +00:00
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
8b26614fa7
Combine results include check in spec/models/account ( #28471 )
2024-01-11 16:17:45 +00:00
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00:00
2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec ( #28695 )
2024-01-11 15:13:11 +00:00
95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec ( #28696 )
2024-01-11 15:11:57 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
4e08a4892f
Move streaming `around` config into manager class ( #28684 )
2024-01-11 10:54:42 +00:00
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
2024-01-11 10:45:26 +00:00
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
0a7cff53c2
Add coverage for `Account.followable_by` scope ( #28689 )
2024-01-11 09:30:29 +00:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
8422b8ded0
Extract capybara config and improve headless_chrome driver config ( #28681 )
2024-01-10 14:54:11 +00:00
543d7890fd
Use normalizes to prepare `User` values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command ( #28669 )
2024-01-10 09:36:12 +00:00
63d0b52cf3
Add a system spec for the `/share` endpoint ( #28672 )
2024-01-09 21:58:19 +00:00
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
1781849884
Inline what remains of the rails-settings-cached gem ( #28618 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
5dc634796a
Misc coverage improvements re: sidekiq/inline ( #28651 )
2024-01-09 09:40:08 +00:00
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
2024-01-08 15:26:30 +00:00
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
2024-01-08 15:26:14 +00:00
157fc69954
Make request_pool_spec tests more robust ( #28610 )
2024-01-08 12:29:05 +00:00
aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value ( #28624 )
2024-01-08 11:20:59 +00:00
832b92ac3e
Add attachment check to spec/service/suspend_account_service spec ( #28619 )
2024-01-08 11:05:10 +00:00
12bed81187
Add validation specs to `CustomFilter` model ( #28600 )
2024-01-05 15:13:59 +00:00
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec ( #28596 )
2024-01-04 16:55:00 +00:00
f06c1f1552
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features ( #28576 )
2024-01-04 09:20:32 +00:00
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
2024-01-03 14:12:56 +00:00
74a0d81e90
Add coverage for CLI `self-destruct` command ( #28565 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-03 13:06:38 +00:00
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
2024-01-03 10:23:58 +00:00
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
a2624ff739
Convert signature verification specs to request specs ( #28443 )
2023-12-22 18:56:22 +00:00
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
2023-12-22 15:29:50 +00:00
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
2023-12-22 12:57:29 +00:00
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
2023-12-22 08:32:27 +00:00
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +00:00
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
2023-12-21 14:23:53 +00:00
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
2023-12-21 11:20:12 +00:00
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
2023-12-21 11:19:56 +00:00
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
2023-12-21 10:10:18 +00:00
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
2023-12-21 09:28:41 +00:00
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
2023-12-21 09:18:38 +00:00
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
2023-12-21 08:51:03 +00:00
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
961d65aba6
Add coverage to CLI Maintenance for duplicate users on `confirmation_token` and `reset_password_token` values ( #28434 )
2023-12-20 08:54:04 +00:00
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
6c00d5b0c4
Fix test failure caused by glitch-soc changes
2023-12-19 21:14:39 +01:00
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
2023-12-19 15:17:22 +00:00
c7c727994a
Add spec for `CLI::Maintenance#fix_duplicates` ( #28326 )
2023-12-19 13:10:33 +00:00
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
2023-12-19 10:55:39 +00:00
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
476d1237d4
Typo fix in json ld helper spec ( #28417 )
2023-12-18 16:47:22 +00:00
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
af366f65ee
Add spec coverage for `models/form/custom_emoji_batch` class ( #28388 )
2023-12-18 12:41:37 +00:00
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
2023-12-18 10:26:09 +00:00
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
2023-12-15 15:52:00 +00:00
db897eaa5a
Unwind `map` on single-item array in `spec/services/delete_account_service` spec ( #28358 )
2023-12-14 14:07:54 +00:00
ef9797a395
Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )
2023-12-14 10:46:43 +00:00
Claire
Matt Jankowski
Damien Mathieu
Wolfgang Fournès
Emelia Smith
Eugen Rochko
MitarashiDango
Renaud Chaput
Jean Boussier