Claire
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
Claire
5152dd869e
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 17:31:50 +00:00
Claire
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00:00
Matt Jankowski
e9b0f0c314
Add basic coverage for `RemoveDomainsFromFollowersService` class ( #29327 )
2024-02-22 10:53:38 +00:00
Matt Jankowski
7c7dfe7de3
Add basic coverage for `RemoveFeaturedTagService` class ( #29328 )
2024-02-22 10:51:04 +00:00
Matt Jankowski
6342ddd698
Add basic coverage for `UnfavouriteService` class ( #29329 )
2024-02-22 10:48:42 +00:00
Matt Jankowski
f70905f127
Add basic coverage for `UnmuteService` class ( #29330 )
2024-02-22 10:48:09 +00:00
Matt Jankowski
a69fe534e3
Add basic coverage for `WebhookService` class ( #29331 )
2024-02-22 10:46:20 +00:00
Matt Jankowski
d1602c017d
Add basic coverage for `ApproveAppealService` class ( #29333 )
2024-02-22 10:40:07 +00:00
Matt Jankowski
ab2ef63a03
Add basic coverage for `VoteService` class ( #29334 )
2024-02-22 10:39:18 +00:00
Claire
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-21 17:45:06 +00:00
Matt Jankowski
08342ad40c
Add basic coverage for `AfterUnallowDomainService` class ( #29324 )
2024-02-21 17:13:11 +00:00
Matt Jankowski
8f61e32569
Add basic coverage for `AppealService` class ( #29322 )
2024-02-21 17:12:31 +00:00
Matt Jankowski
b73932461f
Add basic coverage for `CreateFeaturedTagService` class ( #29321 )
2024-02-21 16:58:19 +00:00
Matt Jankowski
5f19e7e799
Add basic coverage for `ProcessHashtagsService` class ( #29320 )
2024-02-21 16:57:45 +00:00
Matt Jankowski
1f648fdf1a
Remove erroneous service type on `TagFeed` model spec ( #29302 )
2024-02-21 11:25:33 +00:00
Matt Jankowski
64f9939e39
Use `capture_emails` helper to improve email assertions in specs ( #29245 )
2024-02-19 15:57:47 +00:00
Wolfgang Fournès
86627ea2e4
Add a missing thread example to the statuses spec ( #29278 )
2024-02-19 13:35:58 +00:00
Matt Jankowski
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
Claire
96ddf1d482
Fix flaky end-to-end OCR test ( #29244 )
2024-02-16 16:57:23 +00:00
Matt Jankowski
1946e171e6
Reduce round trips in admin/disputes/appeals spec ( #29234 )
2024-02-16 13:46:28 +00:00
Matt Jankowski
3454fcbd71
Reduce round trips in auth/sessions spec ( #29233 )
2024-02-16 13:38:49 +00:00
Matt Jankowski
a316c0e38d
Reduce round trips in disputes/appeals spec ( #29232 )
2024-02-16 13:01:15 +00:00
Matt Jankowski
117b507df5
Extract `subject` from `User#mark_email_as_confirmed!` spec ( #29231 )
2024-02-16 13:01:04 +00:00
Matt Jankowski
1690fb39e6
Reduce `RSpec/MultipleExpectations` in instance_actors_controller spec ( #29229 )
2024-02-16 13:00:11 +00:00
Matt Jankowski
bba488c189
Reduce `RSpec/MultipleExpectations` in media_attachment spec ( #29228 )
2024-02-16 13:00:09 +00:00
Claire
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
Claire
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
Matt Jankowski
a9f9b0097b
Reduce `RSpec/MultipleExpectations` in captcha feature spec ( #29226 )
2024-02-16 07:52:57 +00:00
Matt Jankowski
4b7f04e3ea
Reduce `RSpec/MultipleExpectations` in post_status_service spec ( #29225 )
2024-02-16 07:52:29 +00:00
Matt Jankowski
ed4939296a
Reduce `RSpec/MultipleExpectations` in ap/activity/create spec ( #29224 )
2024-02-16 07:43:00 +00:00
Matt Jankowski
1df2ffc3ee
Use `subject` in blacklist email validator spec ( #29211 )
2024-02-16 07:42:03 +00:00
Matt Jankowski
fc4f823464
Avoid local block var assignment in ap/process_status_update_service spec ( #29210 )
2024-02-16 07:41:25 +00:00
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
Claire
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
Claire
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
Claire
bbbbf00084
Fix OmniAuth tests ( #29201 )
2024-02-14 14:57:49 +00:00
Claire
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
Emelia Smith
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
Claire
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
Emelia Smith
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
Emelia Smith
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
Emelia Smith
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 18:11:47 +00:00
Claire
ca8fbda5d0
Add end-to-end test for OCR in media uploads ( #29148 )
2024-02-08 19:13:44 +00:00
Matt Jankowski
a9e91eb955
Add common stub setup for resolv dns in email mx validator spec ( #29140 )
2024-02-08 14:26:45 +00:00
Matt Jankowski
15437e4ad9
Add `context` and `before` to lengthy tag manager spec examples ( #29129 )
2024-02-08 10:03:04 +00:00
Matt Jankowski
5271131658
Extract helper method for repeated form fill in admin/domain_blocks feature spec ( #29128 )
2024-02-08 10:02:53 +00:00
Claire
eff447a455
Rewrite signature verification using regexps and `StringScanner` ( #29133 )
2024-02-07 17:24:42 +00:00
Matt Jankowski
95da28d201
Add common `ThreadingHelper` module for specs ( #29116 )
2024-02-07 14:53:29 +00:00
Claire
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
Matt Jankowski
da50217b88
Combine repeated requests in `admin/accounts` controller spec ( #29119 )
2024-02-07 10:59:32 +00:00
Claire
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
Matt Jankowski
0df86d77fd
Reduce `RSpec/ExampleLength` in PostStatusService spec example ( #29105 )
2024-02-06 14:36:04 +00:00
Matt Jankowski
2d6ab44556
Reduce request/response round-trips in ap/collections controller spec ( #29102 )
2024-02-06 13:10:00 +00:00
Matt Jankowski
978fdc71ca
Reduce expectation count in example from `ProcessAccountService` spec ( #29100 )
2024-02-06 13:04:02 +00:00
Matt Jankowski
577520b637
Replace deprecated `Sidekiq::Testing` block style ( #29097 )
2024-02-06 12:49:48 +00:00
Matt Jankowski
df7acdcee5
Update markers API spec for error case ( #29096 )
2024-02-06 12:47:04 +00:00
Emelia Smith
4fb7f611de
Return domain block digests from admin domain blocks API ( #29092 )
2024-02-06 12:38:14 +00:00
Matt Jankowski
4cf07ed78c
Add missing action logging to `api/v1/admin/reports#update` ( #29044 )
2024-02-06 11:34:11 +00:00
Claire
66dda7c762
Fix already-invalid reports failing to resolve ( #29027 )
2024-02-06 09:35:27 +00:00
Claire
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
Claire
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
Matt Jankowski
f4416e6b3a
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 11:15:23 +01:00
Matt Jankowski
8b7b0ee598
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 09:46:31 +00:00
Matt Jankowski
86fbde7b46
Fix `Style/NumericLiterals` cop in ProfileStories support module ( #28971 )
2024-01-30 15:38:33 +00:00
Matt Jankowski
f91acba70a
Combine repeated requests in account controller concern spec ( #28957 )
2024-01-30 15:32:20 +00:00
Claire
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
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Matt Jankowski
ff8937aa2c
Move `api/v1/statuses/*` to request spec ( #28954 )
2024-01-26 17:45:54 +00:00
Matt Jankowski
44f6d285af
Combine repeated subject in ap fetch remote actor service spec ( #28953 )
2024-01-26 17:44:12 +00:00
Matt Jankowski
239244e2ed
Combine repeated subject in ap fetch remote account service spec ( #28952 )
2024-01-26 17:43:08 +00:00
Matt Jankowski
5119fbc9b7
Move `api/v1/admin/trends/links/preview_card_providers` to request spec ( #28951 )
2024-01-26 17:41:39 +00:00
Matt Jankowski
b6baab447d
Move `api/v2/admin/accounts` to request spec ( #28950 )
2024-01-26 17:41:13 +00:00
Matt Jankowski
7adcc0aae3
Move `api/v1/trends/*` to request specs ( #28949 )
2024-01-26 17:40:39 +00:00
Matt Jankowski
0b0ca6f3b8
Move `api/v1/timelines/list` to request spec ( #28948 )
2024-01-26 17:40:15 +00:00
Matt Jankowski
e519f113e8
Combine repeated subject in `cacheable response` shared example ( #28945 )
2024-01-26 16:37:05 +00:00
Matt Jankowski
d791bca11b
Combine double subject in `well_known/webfinger` shared example ( #28944 )
2024-01-26 16:36:21 +00:00
Matt Jankowski
09a3493fca
Combine double subject in `api/v1/media` shared example ( #28943 )
2024-01-26 16:35:49 +00:00
Matt Jankowski
5fbdb2055b
Combine repeated `subject` in `cli/accounts` spec shared example ( #28942 )
2024-01-26 16:35:19 +00:00
Matt Jankowski
1a30a517d6
Combine repeated subjects in link details extractor spec ( #28941 )
2024-01-26 16:31:07 +00:00
Matt Jankowski
685eaa04d4
Combine double subject in admin/statuses controller shared example ( #28940 )
2024-01-26 16:30:30 +00:00
Matt Jankowski
beb74fd71c
Combine double subjects in instance actors controller shared example ( #28939 )
2024-01-26 16:28:50 +00:00
Matt Jankowski
beaef4b672
Combine double subjects in application controller shared example ( #28938 )
2024-01-26 16:23:12 +00:00
Matt Jankowski
6d35a77c92
Combine repeated subjects in `models/user` spec ( #28937 )
2024-01-26 16:22:44 +00:00
Matt Jankowski
2f8656334d
Combine double subjects in `admin/accounts` controller spec ( #28936 )
2024-01-26 16:21:31 +00:00
Matt Jankowski
9cc1817bb4
Fix intmermittent failure in `api/v1/accounts/statuses` controller spec ( #28931 )
2024-01-26 14:10:26 +00:00
Matt Jankowski
0e0a94f483
Handle CLI failure exit status at the top-level script ( #28322 )
2024-01-26 08:53:44 +00:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Eugen Rochko
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
Matt Jankowski
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
Matt Jankowski
2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` ( #28361 )
2024-01-25 13:37:25 +00:00
Matt Jankowski
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
Matt Jankowski
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
Claire
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
Claire
0471a78055
Add tests for redirect confirmations ( #28903 )
2024-01-25 11:13:33 +00:00
Claire
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
Matt Jankowski
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
2024-01-24 10:31:31 +00:00
Matt Jankowski
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
2024-01-23 09:10:11 +00:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Claire
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
Matt Jankowski
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
Matt Jankowski
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
Claire
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
2024-01-19 12:43:10 +00:00
Claire
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
Matt Jankowski
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
Matt Jankowski
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
Matt Jankowski
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
Matt Jankowski
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
Matt Jankowski
3d82040b26
Reduced repeated setup in `UnallowDomainService` spec ( #28785 )
2024-01-18 10:11:10 +00:00
Matt Jankowski
6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec ( #28786 )
2024-01-18 10:07:49 +00:00
Matt Jankowski
07e10e3747
Combine assertions about same setup in `Account#suspend!` spec ( #28787 )
2024-01-18 09:36:59 +00:00
Claire
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
Matt Jankowski
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
2024-01-17 13:38:37 +00:00
Matt Jankowski
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
Claire
dee561604b
Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream
2024-01-15 22:37:21 +01:00
Matt Jankowski
b4c332104a
Use top-level `warn` in JS errors check ( #28745 )
2024-01-15 21:26:11 +00:00
Claire
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
Claire
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
Claire
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
Claire
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
Claire
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
Claire
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
Matt Jankowski
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
Matt Jankowski
e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
Claire
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
MitarashiDango
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
Matt Jankowski
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
Matt Jankowski
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
Matt Jankowski
df9e220364
Add JS console errors check ( #28682 )
2024-01-12 09:12:31 +00:00
Matt Jankowski
cd37048439
Move followable_by coverage to suggestions ( #28697 )
2024-01-12 09:11:34 +00:00
Matt Jankowski
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
Claire
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
Matt Jankowski
8b26614fa7
Combine results include check in spec/models/account ( #28471 )
2024-01-11 16:17:45 +00:00
Matt Jankowski
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00:00
Matt Jankowski
2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec ( #28695 )
2024-01-11 15:13:11 +00:00
Matt Jankowski
95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec ( #28696 )
2024-01-11 15:11:57 +00:00
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
Claire
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
Claire
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
Matt Jankowski
4e08a4892f
Move streaming `around` config into manager class ( #28684 )
2024-01-11 10:54:42 +00:00
Matt Jankowski
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
2024-01-11 10:45:26 +00:00
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
Matt Jankowski
0a7cff53c2
Add coverage for `Account.followable_by` scope ( #28689 )
2024-01-11 09:30:29 +00:00
Claire
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
Claire
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
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
Matt Jankowski
8422b8ded0
Extract capybara config and improve headless_chrome driver config ( #28681 )
2024-01-10 14:54:11 +00:00
Matt Jankowski
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
Matt Jankowski
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
Matt Jankowski
742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command ( #28669 )
2024-01-10 09:36:12 +00:00
Renaud Chaput
63d0b52cf3
Add a system spec for the `/share` endpoint ( #28672 )
2024-01-09 21:58:19 +00:00
Claire
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
Jean Boussier
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
Matt Jankowski
5dc634796a
Misc coverage improvements re: sidekiq/inline ( #28651 )
2024-01-09 09:40:08 +00:00
Matt Jankowski
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
2024-01-08 15:26:30 +00:00
Matt Jankowski
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
2024-01-08 15:26:14 +00:00
Claire
157fc69954
Make request_pool_spec tests more robust ( #28610 )
2024-01-08 12:29:05 +00:00
Matt Jankowski
aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value ( #28624 )
2024-01-08 11:20:59 +00:00
Matt Jankowski
832b92ac3e
Add attachment check to spec/service/suspend_account_service spec ( #28619 )
2024-01-08 11:05:10 +00:00
Matt Jankowski
12bed81187
Add validation specs to `CustomFilter` model ( #28600 )
2024-01-05 15:13:59 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
Claire
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
Matt Jankowski
964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec ( #28596 )
2024-01-04 16:55:00 +00:00
Matt Jankowski
f06c1f1552
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features ( #28576 )
2024-01-04 09:20:32 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
Matt Jankowski
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
Matt Jankowski
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
2024-01-03 14:12:56 +00:00
Matt Jankowski
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
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
Claire
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
2024-01-03 10:23:58 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
Claire
a2624ff739
Convert signature verification specs to request specs ( #28443 )
2023-12-22 18:56:22 +00:00
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
Matt Jankowski
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
2023-12-22 15:29:50 +00:00
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
Matt Jankowski
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
2023-12-22 12:57:29 +00:00
Matt Jankowski
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
2023-12-22 08:32:27 +00:00
Matt Jankowski
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +00:00
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
Claire
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
Claire
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
Claire
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
Matt Jankowski
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
2023-12-21 14:23:53 +00:00
Matt Jankowski
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
2023-12-21 11:20:12 +00:00
Matt Jankowski
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
2023-12-21 11:19:56 +00:00
Matt Jankowski
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
2023-12-21 10:10:18 +00:00
Matt Jankowski
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
2023-12-21 09:28:41 +00:00
Matt Jankowski
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
2023-12-21 09:18:38 +00:00
Matt Jankowski
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
2023-12-21 08:51:03 +00:00
Claire
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
Claire
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
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
Claire
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
Matt Jankowski
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
Claire
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