Skye
166d412414
Merge remote-tracking branch 'treehouse/main' into th-downstream
7 months ago
3644101a79
th: Merge remote-tracking branch 'glitch/main'
7 months ago
d6a8c69b5c
th: Merge remote-tracking branch 'glitch/main'
7 months ago
ecc917008e
th: maybe deal with spam
7 months ago
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
7 months ago
Skye
76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
7 months ago
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
7 months ago
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
7 months ago
486e4bc7d3
Fix OmniAuth tests ( #29201 )
7 months ago
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
7 months ago
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>
7 months ago
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
7 months ago
43e58d1558
th: Merge remote-tracking branch 'glitch/main'
8 months ago
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
8 months ago
f4416e6b3a
Configure selenium to use Chrome version 120 ( #29038 )
8 months ago
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
8 months ago
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
8 months ago
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.
8 months ago
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
8 months ago
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
8 months ago
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
8 months ago
2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` ( #28361 )
8 months ago
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
8 months ago
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
8 months ago
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
8 months ago
0471a78055
Add tests for redirect confirmations ( #28903 )
8 months ago
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.
8 months ago
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
8 months ago
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
8 months ago
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
8 months ago
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
8 months ago
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
8 months ago
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
8 months ago
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
8 months ago
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
8 months ago
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
8 months ago
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
8 months ago
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
8 months ago
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
8 months ago
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
8 months ago
0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope ( #28796 )
8 months ago
3d82040b26
Reduced repeated setup in `UnallowDomainService` spec ( #28785 )
8 months ago
6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec ( #28786 )
8 months ago
07e10e3747
Combine assertions about same setup in `Account#suspend!` spec ( #28787 )
8 months ago
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.
8 months ago
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
8 months ago
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
8 months ago
dee561604b
Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream
8 months ago
b4c332104a
Use top-level `warn` in JS errors check ( #28745 )
8 months ago
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
8 months ago
Skye
Kouhai
Claire
Emelia Smith
Matt Jankowski