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
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
a2c4f5f5c0
Add coverage for `ListAccount` follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
17c57c46e7
Add coverage for title/limit validations in `List` model ( #31869 )
2024-09-12 13:25:23 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
d0ab94c4d2
Add `FeaturedTag` coverage, use `pick` in model ( #31828 )
2024-09-09 19:57:19 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
5acec087ca
Simplify basic presence validations ( #29664 )
2024-09-05 15:36:05 +00:00
ba9fd1c32e
Add coverage for `Account#prepare_contents` callback ( #31748 )
2024-09-05 09:48:33 +00:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
14af5b47ac
Add coverage for model normalizations ( #31734 )
2024-09-04 05:12:40 +00:00
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
7c26e5e4a1
Add `Reviewable` model concern ( #31152 )
2024-09-03 15:37:45 +00:00
67faaf5557
Simplify account model username presence validation spec ( #31013 )
2024-09-03 15:30:57 +00:00
fcb83be8b2
Improve coverage specificity for Webhook enable/disable/secret specs ( #31194 )
2024-09-03 15:30:13 +00:00
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations ( #31474 )
...
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
95c11d365d
Don't push to cache buster if attachment path is nil ( #31414 )
2024-08-14 08:57:42 +00:00
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
994ef16b72
Bust CDN cache on media deletion ( #31353 )
2024-08-09 12:48:34 +00:00
06e034db15
Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream
2024-08-07 19:22:25 +02:00
af2aec1a82
Change notification requests to only count mentions ( #31322 )
2024-08-07 11:12:36 +00:00
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
cf5d2c3fe4
Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream
2024-07-25 17:47:02 +02:00
337a7fcf30
Fix ß bug in regexp for mentions and tags ( #31122 )
2024-07-25 14:24:19 +00:00
2aac73341a
Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Conflict due to glitch-soc's local-only posts.
Ported upstream's changes while keeping glitch-soc's feature.
2024-07-22 17:38:30 +02:00
6e4305de69
Fix spec descriptions around configurable limit values ( #31079 )
2024-07-22 08:02:31 +00:00
f7598b267b
Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream
2024-07-19 17:45:19 +02:00
3a00f89aa1
Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in account spec correctly ( #31075 )
2024-07-19 15:31:48 +00:00
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
848b59c8ae
Reduce factory creation in `MediaAttachment` model spec ( #31058 )
2024-07-18 15:23:46 +00:00
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
91ef4a6fc5
Add assertion about key columns to account key generate spec ( #30635 )
2024-07-15 10:42:18 +00:00
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
35a437a03f
Destroy `NotificationRequest`s that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
d41b43ed4f
Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API ( #30932 )
2024-07-08 07:41:50 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
836c0477ac
Use vips setting instead of env var in media processing spec ( #30859 )
2024-06-27 16:03:26 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
d818ddd687
Extract `SIGN_COUNT_LIMIT` constant in `WebauthnCredential` class ( #30636 )
2024-06-11 15:36:21 +00:00
62d070c438
Check both before/after state in `AccountDomainBlock` spec ( #30640 )
2024-06-11 13:59:56 +00:00
1622f7aeb9
Remove duplicate fabricator validity checks ( #29667 )
2024-06-11 07:48:42 +00:00
cfd4823b65
Use fabricator in follow_spec ( #30642 )
2024-06-11 06:57:09 +00:00
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
9bf2e2eda0
Extract `TEXT_LENGTH_LIMIT` constant in `Appeal` class ( #30638 )
2024-06-10 15:23:17 +00:00
3e3f3d7580
Match report validation spec to extracted constant ( #30633 )
2024-06-10 15:04:01 +00:00
92b3004bf3
Reference constants from account validation specs ( #30634 )
2024-06-10 15:03:41 +00:00
28f9a8f2ec
Add Specs for Scheduled Status Model Validations ( #30585 )
2024-06-10 14:52:33 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
1408733386
Fix Mastodon relying on ImageMagick even with `MASTODON_USE_LIBVIPS` ( #30590 )
2024-06-07 09:27:59 +00:00
a662c6d1d8
Use `sidekiq_inline` in admin/account_action model spec ( #30565 )
2024-06-06 14:12:58 +00:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00:00
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
1e7d5d2957
Update `devise-two-factor` to version 5.0.0 ( #28325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
There was an extra newline in glitch-soc for some reason.
Removed it.
2024-05-01 19:38:34 +02:00
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
11e0049b08
Use enum-generated scopes/queries for `BulkImport` ( #29975 )
2024-04-18 10:13:35 +00:00
650c548c31
Add `not_featured_by` scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
6fed108703
Use Rails `upsert` to generate update_count! query in Counters concern ( #28738 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-17 08:16:51 +00:00
285f63c02e
Use composable query in `User.active` scope ( #29775 )
2024-04-08 13:53:49 +00:00
babbf6017d
Remove caching in `cache_collection` ( #29862 )
2024-04-08 13:46:13 +00:00
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
876aa35350
Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
65ca37bbaa
Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
2024-03-13 20:14:18 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
6262ceeb70
Fix `RSpec/DescribedClass` cop ( #29472 )
2024-03-13 15:42:39 +00:00
c09b8a7164
Add `Account.without_internal` scope ( #29559 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 14:11:23 +00:00
01b624c4a0
Use `normalizes` on `CustomFilter#context` value ( #27602 )
2024-03-13 08:50:21 +00:00
216cea1e27
Fix incorrect frequency value in `FriendsOfFriendsSource` data ( #29550 )
2024-03-12 08:38:32 +00:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
4a6ddbc9c0
Normalize idna domain before account unblock domain ( #29530 )
2024-03-11 09:28:08 +00:00
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
45e56db8e4
Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts ( #29306 )
2024-03-04 06:35:20 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
a25014de8f
Improve `IpBlock` model test coverage ( #29460 )
2024-03-01 16:17:40 +00:00
f01605c665
Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.tsx`:
Changes applied to `app/javascript/core/admin.ts` instead.
2024-03-01 13:02:59 +01:00
3389c41b58
Move `nobody` position in `UserRole` magic number to constant ( #29465 )
2024-03-01 11:05:24 +00: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
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01: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
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
117b507df5
Extract `subject` from `User#mark_email_as_confirmed!` spec ( #29231 )
2024-02-16 13:01:04 +00:00
bba488c189
Reduce `RSpec/MultipleExpectations` in media_attachment spec ( #29228 )
2024-02-16 13:00:09 +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
95da28d201
Add common `ThreadingHelper` module for specs ( #29116 )
2024-02-07 14:53:29 +00:00
66dda7c762
Fix already-invalid reports failing to resolve ( #29027 )
2024-02-06 09:35:27 +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
6d35a77c92
Combine repeated subjects in `models/user` spec ( #28937 )
2024-01-26 16:22:44 +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
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
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
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +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
Claire
Matt Jankowski
renovate[bot]
David Roetzel
Eugen Rochko
Emelia Smith
Edward Moulsdale
Jeong Arm
Adam Niedzielski
kyori19
Daniel M Brasil