Matt Jankowski
8ef59729a1
Ignore intermittent chrome/manifest/icon interaction failure ( #30793 )
2024-06-25 13:57:40 +00:00
Emelia Smith
30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page ( #30812 )
2024-06-25 07:46:53 +00:00
Claire
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
Claire
8827cd597e
Fix /admin/accounts/:account_id/statuses/:id
for edited posts with media attachments ( #30819 )
2024-06-24 13:11:10 +00:00
Claire
3b4607991d
Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream
2024-06-22 20:59:23 +02:00
Matt Jankowski
72484a194f
Remove CacheBuster
default options ( #30718 )
2024-06-21 15:32:49 +00:00
David Roetzel
2cab1c7b09
Improve encoding detection for link cards ( #30780 )
2024-06-21 12:51:10 +00:00
Claire
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
Matt Jankowski
84a31319e9
Add match_json_values
and use in AP worker specs ( #30720 )
2024-06-19 13:46:52 +00:00
Claire
52e34a6bd6
Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream
2024-06-19 11:59:06 +02:00
Claire
8098d27f84
Stop calling Webpacker in full-stack tests ( #30763 )
2024-06-19 09:31:30 +00:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
Claire
58ace2e45e
Fix SQL error in admin measures API ( #30753 )
2024-06-18 16:04:58 +00:00
Matt Jankowski
38c6825eda
Remove unused Extractor#extract_cashtags_with_indices
method ( #30742 )
2024-06-18 12:16:16 +00:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Matt Jankowski
d7b7617321
Use class_names
in admin/account_moderation_notes helper ( #30719 )
2024-06-17 12:20:57 +00:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Matt Jankowski
f287462f76
Fix repeated Delete/Undo assertion in remove status service spec ( #30715 )
2024-06-17 10:21:29 +00:00
Claire
45abddb302
Fix pagination attributes not being returned in ungroupable-only pages ( #30688 )
2024-06-13 14:10:34 +00:00
Claire
bf56e982a9
Fix notifications from limited users being outright dropped ( #30559 )
2024-06-12 13:50:38 +00:00
Claire
1dfd516284
Fix duplicate @context
attribute in user export ( #30653 )
2024-06-12 07:28:28 +00:00
Claire
f214813919
Adapt settings spec to glitch-soc
2024-06-11 19:54:27 +02:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Matt Jankowski
d818ddd687
Extract SIGN_COUNT_LIMIT
constant in WebauthnCredential
class ( #30636 )
2024-06-11 15:36:21 +00:00
Matt Jankowski
62d070c438
Check both before/after state in AccountDomainBlock
spec ( #30640 )
2024-06-11 13:59:56 +00:00
Matt Jankowski
1622f7aeb9
Remove duplicate fabricator validity checks ( #29667 )
2024-06-11 07:48:42 +00:00
Matt Jankowski
edf6d64eeb
Use correct params in settings/preferences/appearance
spec ( #30379 )
2024-06-11 07:36:46 +00:00
Matt Jankowski
b2496177e0
Use correct params in v1/admin/domain_allows
spec ( #30378 )
2024-06-11 07:35:30 +00:00
Matt Jankowski
cfd4823b65
Use fabricator in follow_spec ( #30642 )
2024-06-11 06:57:09 +00:00
Claire
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
Matt Jankowski
9cc4040308
Extract COMMENT_SIZE_LIMIT
constant in AP::Activity::Flag
class ( #30637 )
2024-06-10 15:23:55 +00:00
Matt Jankowski
9bf2e2eda0
Extract TEXT_LENGTH_LIMIT
constant in Appeal
class ( #30638 )
2024-06-10 15:23:17 +00:00
Matt Jankowski
3e3f3d7580
Match report validation spec to extracted constant ( #30633 )
2024-06-10 15:04:01 +00:00
Matt Jankowski
92b3004bf3
Reference constants from account validation specs ( #30634 )
2024-06-10 15:03:41 +00:00
Daniel M Brasil
28f9a8f2ec
Add Specs for Scheduled Status Model Validations ( #30585 )
2024-06-10 14:52:33 +00:00
Daniel M Brasil
77c2216e47
fix: Return HTTP 422 when scheduled status time is less than 5 minutes ( #30584 )
2024-06-10 13:33:48 +00:00
Matt Jankowski
827e36ff9e
Fix Capybara/NegationMatcher
cop in spec/system ( #30616 )
2024-06-08 17:10:06 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
1408733386
Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS
( #30590 )
2024-06-07 09:27:59 +00:00
Matt Jankowski
04ebbe3077
Add sidekiq_inline
to appeal service spec ( #30562 )
2024-06-06 14:19:37 +00:00
Matt Jankowski
07cc94e05f
Use sidekiq_inline
in requests/api/v1/admin/account_actions spec ( #30563 )
2024-06-06 14:19:22 +00:00
Matt Jankowski
9b9b0e25b6
Use sidekiq_inline
in requests/api/v1/reports spec ( #30564 )
2024-06-06 14:14:33 +00:00
Matt Jankowski
a662c6d1d8
Use sidekiq_inline
in admin/account_action model spec ( #30565 )
2024-06-06 14:12:58 +00:00
Claire
578b0eae7d
Fix /api/v1/timelines/link specs for glitch-soc default settings
2024-06-06 12:52:15 +02:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Eugen Rochko
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
Emelia Smith
e02d23b549
Change read:me
scope to profile
scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Emelia Smith
4655be0da6
Fix add validation to webpush subscription keys ( #30542 )
2024-06-05 19:16:47 +00:00
Eugen Rochko
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
Emelia Smith
eef2cc054f
Add url validation to Web::PushSubscription endpoints ( #30540 )
2024-06-05 08:06:06 +00:00
Matt Jankowski
249cbc449c
Use existing config access to local_domain
value ( #30509 )
2024-06-03 09:15:58 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Matt Jankowski
4d047b95ae
Use more direct attribute handling in User
fabricator ( #30495 )
2024-05-31 09:54:11 +00:00
Claire
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
Claire
16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh
2024-05-30 14:14:04 +02:00
Claire
3ea4275ae3
Merge pull request from GHSA-5fq7-3p3j-9vrf
2024-05-30 14:03:13 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Emelia Smith
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
Claire
36fe8f8566
Change ids
param to id
in /api/v1/statuses
and /api/v1/accounts
for consistency ( #30465 )
2024-05-29 09:19:17 +00:00
Matt Jankowski
c61e356475
Add Status::MEDIA_ATTACHMENTS_LIMIT
configuration constant ( #30433 )
2024-05-27 09:49:44 +00:00
Matt Jankowski
564ebfefcf
Remove hard reference from status pin validator spec ( #30432 )
2024-05-27 09:20:28 +00:00
Claire
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Claire
0e8633f6c7
Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
Claire
133d98fb25
Normalize language code of incoming posts ( #30403 )
2024-05-23 17:28:18 +00:00
Matt Jankowski
3a862439df
Remove unused account record in api/v2/admin/accounts spec ( #30397 )
2024-05-23 08:26:58 +00:00
Claire
5ab111554e
Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
Claire
32223863a5
Add coverage to /admin/accounts/:id
( #30386 )
2024-05-21 13:17:34 +00:00
Claire
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
Claire
89f89d738f
Revert "Allow unblocking email addresses from any matching account ( #29305 )" ( #30385 )
2024-05-21 08:56:08 +00:00
Claire
20fdf8e22c
Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream
2024-05-20 17:47:48 +02:00
Matt Jankowski
0a2110b9af
Add coverage for custom filters ( #30347 )
2024-05-20 15:00:09 +00:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Claire
de4815afda
Add more tests for self-destruct mode ( #30374 )
2024-05-20 10:06:51 +00:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange
cop ( #30343 )
2024-05-20 09:37:36 +00:00
Matt Jankowski
70608f824e
Add coverage for AdminMailer#auto_close_registrations
( #30349 )
2024-05-20 08:03:39 +00:00
Emelia Smith
2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications ( #29192 )
2024-05-17 13:46:12 +00:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Matt Jankowski
65e82211cd
Rename cache_*
methods to preload_*
in controller concern ( #30209 )
2024-05-16 08:03:46 +00:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
Jason Punyon
85c625d319
Fix repetitive database queries from #30040 ( #30259 )
2024-05-15 09:38:16 +00:00
Matt Jankowski
6beead3867
Move simplecov
config into rails_helper
( #30302 )
2024-05-15 09:33:36 +00:00
Renaud Chaput
40639510f8
Retain unconfirmed users longer (1 week) ( #30285 )
2024-05-15 08:27:34 +00:00
Claire
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
Matt Jankowski
0d397db5dd
Consolidate system specs into single directory, use rspec tags for configuration ( #30206 )
2024-05-10 12:36:09 +00:00
Matt Jankowski
fa43a6c835
Use more accurate redirect_uri
in oauth spec ( #30212 )
2024-05-10 09:43:59 +00:00
Claire
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
Claire
2fe1b8d169
Add API to get multiple accounts and statuses ( #27871 )
...
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
2024-05-06 15:19:15 +00:00
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
Emelia Smith
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
Claire
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
Matt Jankowski
dbaa4ed891
Use chewy
which relaxes ES version reqs ( #30157 )
2024-05-06 11:50:45 +00:00
Claire
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00:00
Claire
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
Claire
f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
Claire
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Claire
253ead3aa7
Fix not being able to block a subdomain of an already-blocked domain through the API ( #30119 )
2024-05-02 20:56:21 +00:00
Matt Jankowski
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
Matt Jankowski
2447497a4c
Status length validation spec updates ( #30132 )
2024-05-02 08:31:06 +00:00
Claire
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
Claire
eeefb7cdbc
Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream
2024-05-01 19:42:34 +02:00
Claire
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
Claire
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
Claire
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
Claire
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
Claire
555e33a392
Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict because of our different theming systems.
Updated accordingly, along with `app/helpers/theme_helper.rb`
and `app/helpers/theme_helper_spec.rb`.
2024-05-01 18:38:55 +02:00
Claire
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
Claire
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Claire
d52263e0e3
Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependencies as well.
2024-05-01 17:04:33 +02:00
Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Claire
7208edbd37
Replace use_pack
, layouts/theme
and @theme
by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Claire
91ca90e25b
Fix Idempotency-Key ignored when scheduling a post ( #30084 )
2024-04-26 13:19:02 +00:00
Claire
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
Emelia Smith
049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )
2024-04-23 11:47:00 +00:00
Matt Jankowski
a15139bc02
Fix intermittent order based failure in UpdateStatusService
spec ( #30008 )
2024-04-22 08:30:38 +00:00
Matt Jankowski
f5d341382e
Add any_args
to have_enqueued_sidekiq_job call (quiets deprecation) ( #29999 )
2024-04-19 19:44:59 +00:00
Matt Jankowski
11e0049b08
Use enum-generated scopes/queries for BulkImport
( #29975 )
2024-04-18 10:13:35 +00:00
Claire
8bece467f8
Change have_enqueued_sidekiq_job
usage to always make argument expectations explicit ( #29974 )
2024-04-17 11:13:52 +00:00
Matt Jankowski
650c548c31
Add not_featured_by
scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
Matt Jankowski
9ce2db4136
Combine double subject runs and DRY up change check in bulk import service spec ( #29402 )
2024-04-17 08:23:25 +00:00
Matt Jankowski
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
Matt Jankowski
7fed4a9740
Pull out repeated setup to shared setup in statusus/show view spec ( #29927 )
2024-04-15 15:24:31 +00:00
Matt Jankowski
61d108f415
Extract header_tags
method in statuses/show view spec ( #29907 )
2024-04-12 09:50:46 +00:00
Matt Jankowski
da6b9238f5
Expand coverage for admin/metrics/measure/* classes ( #29914 )
2024-04-12 09:38:24 +00:00
Matt Jankowski
ec5a0e0f5e
Expand coverage for admin/metrics/dimension/* classes ( #29913 )
2024-04-12 09:18:35 +00:00
Matt Jankowski
449f99e168
Fix repeated concat output buffer duplicating layout markup ( #29918 )
2024-04-11 23:37:07 +00:00
Matt Jankowski
576554b19b
Use fabrication sequence in domain values ( #29895 )
2024-04-11 08:59:01 +00:00
Matt Jankowski
285f63c02e
Use composable query in User.active
scope ( #29775 )
2024-04-08 13:53:49 +00:00
Claire
babbf6017d
Remove caching in cache_collection
( #29862 )
2024-04-08 13:46:13 +00:00
Claire
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Claire
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
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
Claire
e73cf356d2
Move OAuth flow tests from feature tests to system tests ( #29837 )
2024-04-05 16:52:05 +00:00
Matt Jankowski
b61ae28f8d
Separate methods for theme style and meta color tags ( #29802 )
2024-04-05 09:52:43 +00:00
Matt Jankowski
59da591d13
Improve spec for dimension/languages admin metric ( #29842 )
2024-04-05 08:54:11 +00:00
Claire
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
Claire
1f11aa5f04
Add stub for trending tags in user mailer spec ( #29850 )
2024-04-05 07:48:07 +00:00
Matt Jankowski
191bf5876e
Add coverage for sanitize failure path in api/web/embeds spec ( #29851 )
2024-04-04 16:07:16 +00:00
Matt Jankowski
f87959ab50
Fix RSpec/LetSetup
cop in api/v1/timelines/public spec ( #28972 )
2024-04-02 14:05:02 +00:00
Matt Jankowski
34489591ec
Add max_pinned_statuses
to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
renovate[bot]
589e34d00c
Update dependency selenium-webdriver to v4.19.0 ( #29776 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-02 08:53:44 +00:00
Claire
9c24f2d6b1
Undo notification permissions on individual and domain blocks ( #29570 )
2024-03-26 14:46:38 +00:00
Claire
81a04ac25c
Improve specs for severed relationships ( #29688 )
2024-03-22 16:25:36 +00:00
Matt Jankowski
34f293475e
Fix results/query in api/v1/featured_tags/suggestions
( #29597 )
2024-03-22 15:08:27 +00:00
Claire
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
Claire
814a48517f
Add some more tests for notification policies ( #29698 )
2024-03-21 16:46:38 +00:00
Claire
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
Claire
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
8a1423a474
Allow unblocking email addresses from any matching account ( #29305 )
2024-03-20 14:38:00 +00:00
Claire
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
Matt Jankowski
6d2986017e
Remove unused active_nav_class
helper method ( #29617 )
2024-03-18 13:24:59 +00:00
Claire
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
Matt Jankowski
92855948a0
Remove unused show_landing_strip?
helper method ( #29618 )
2024-03-18 08:55:54 +00:00
Matt Jankowski
ecdbf15ebe
Remove unused link_to_older
and link_to_newer
helper methods ( #29620 )
2024-03-18 08:54:46 +00:00
Claire
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
Matt Jankowski
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
Claire
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
Matt Jankowski
2e91a9bd34
Add include_pagination_headers
matcher to check Link
header in api specs ( #29596 )
2024-03-15 10:17:45 +00:00
Matt Jankowski
e75b55a6d7
Extract target account on list method in bulk import row service spec ( #29601 )
2024-03-15 09:31:25 +00:00
Claire
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
Matt Jankowski
974c7672e5
Extract shared behavior methods in oauth feature spec ( #28360 )
2024-03-14 13:42:59 +00:00
Matt Jankowski
0bc17a3d48
Use enum-generated public_visibility
scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
Matt Jankowski
681a89f684
Readability clean up in ImportVacuum
spec ( #28955 )
2024-03-14 09:24:00 +00:00
Matt Jankowski
f9100743ec
Add Api::ErrorHandling
concern for api/base controller ( #29574 )
2024-03-14 09:09:47 +00:00
Matt Jankowski
42875fee52
Add coverage for bad args/options in CLI::Domains#purge
( #29578 )
2024-03-14 08:58:53 +00:00
Claire
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
Claire
08b10cce52
Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
Conflict due to glitch-soc's different note length handling.
Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
2024-03-13 20:12:58 +01:00
Claire
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
Claire
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
Matt Jankowski
71e5f0f48c
Add coverage for suspended instance actor scenario ( #29571 )
2024-03-13 15:43:40 +00:00
Matt Jankowski
6262ceeb70
Fix RSpec/DescribedClass
cop ( #29472 )
2024-03-13 15:42:39 +00:00
Matt Jankowski
c09b8a7164
Add Account.without_internal
scope ( #29559 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 14:11:23 +00:00
Matt Jankowski
46e902f1f3
Merge api/v1/accounts/credentials
controller spec into existing request spec ( #29006 )
2024-03-13 09:22:43 +00:00
Matt Jankowski
01b624c4a0
Use normalizes
on CustomFilter#context
value ( #27602 )
2024-03-13 08:50:21 +00:00
Matt Jankowski
71eecbfa1f
Move api/v2/filters/*
to request spec ( #28956 )
2024-03-13 08:47:09 +00:00
Matt Jankowski
8349b45d60
Accept extra args that we wont verify in ap/activity/add_spec
( #29005 )
2024-03-13 08:46:11 +00:00
Matt Jankowski
469028b6d3
Remove unneeded type: :service
from spec/services files ( #29304 )
2024-03-13 08:39:26 +00:00
Matt Jankowski
3eaac3af73
Use before_all
block to setup requests/cache_spec
data ( #29437 )
2024-03-13 08:38:57 +00:00
Matt Jankowski
19f0590795
Add basic coverage for TagSearchService
class ( #29319 )
2024-03-13 08:33:03 +00:00
Matt Jankowski
96013cd576
Reduce RSpec/ExampleLength
in CSP request spec ( #29104 )
2024-03-13 08:22:32 +00:00
Matt Jankowski
216cea1e27
Fix incorrect frequency value in FriendsOfFriendsSource
data ( #29550 )
2024-03-12 08:38:32 +00:00
Claire
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
Matt Jankowski
24319836de
Convert request-based setup into factory setup in push/subscriptions request spec ( #29489 )
2024-03-11 15:46:25 +00:00
Matt Jankowski
a38e424185
Use unchanging github links in docs/comments ( #29545 )
2024-03-11 15:14:55 +00:00
Eugen Rochko
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
Jeong Arm
4a6ddbc9c0
Normalize idna domain before account unblock domain ( #29530 )
2024-03-11 09:28:08 +00:00
Matt Jankowski
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
Matt Jankowski
98ef38e34e
Ensure unique values in fabricators ( #29515 )
2024-03-11 08:53:24 +00:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
Claire
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
Claire
ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts ( #29306 )
2024-03-04 06:35:20 +00:00
Claire
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
Matt Jankowski
18945f62e0
Convert more API specs from controller->request style ( #29004 )
2024-03-01 16:24:45 +00:00
Daniel M Brasil
a25014de8f
Improve IpBlock
model test coverage ( #29460 )
2024-03-01 16:17:40 +00:00
Claire
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
Matt Jankowski
3389c41b58
Move nobody
position in UserRole
magic number to constant ( #29465 )
2024-03-01 11:05:24 +00:00
Claire
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
Matt Jankowski
eb1b8f69de
Allow pagination Link
headers on API accounts/statuses when pinned true ( #29442 )
2024-02-29 14:21:56 +00:00
Matt Jankowski
6675bf574a
Extract parsed_uri_query_values
helper in ap/replies controller spec ( #29410 )
2024-02-29 13:47:38 +00:00
Matt Jankowski
14c65180df
Use sequence in software_update
fabricator to allow multiple ( #29438 )
2024-02-29 10:51:11 +00:00
Claire
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
Claire
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
Matt Jankowski
8f3c91fc3c
Add change
block expectation to admin/invites#deactivate_all
spec ( #29412 )
2024-02-27 16:25:58 +00:00
Claire
6f7615ba86
Add basic end-to-end test for admin moderation interface ( #29424 )
2024-02-27 15:18:06 +00:00
Matt Jankowski
9e78129e6e
Use "cacheable response" shared example in more places ( #29419 )
2024-02-27 11:50:21 +00:00
Claire
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
Matt Jankowski
8156113d58
Use response_vary_headers
method in requests/cache_spec ( #29411 )
2024-02-26 16:27:07 +00:00
Damien Mathieu
1540f42522
Better tests for auth/registrations#update ( #29303 )
2024-02-26 16:09:56 +00:00
Wolfgang Fournès
d51c3ac087
Add a missing spec to SessionsController#webauthn_options
( #29277 )
2024-02-26 16:09:40 +00:00
Claire
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
Claire
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
Claire
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
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Claire
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
Claire
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
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Claire
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
Claire
73de36318e
Move api/v1/timelines/direct
to request spec
2024-02-24 14:10:05 +01:00
Claire
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
Claire
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
Claire
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
Matt Jankowski
b0064ddda7
Add basic coverage for MoveService
class ( #29301 )
2024-02-23 09:59:29 +00:00
Claire
9d8dfeb5fb
Fix processing of Link
objects in Image
objects ( #29335 )
2024-02-22 22:27:24 +01:00
Matt Jankowski
a6ed148769
Use heredoc on the HTML
blocks in verify link spec ( #29365 )
2024-02-22 21:26:48 +00:00
Claire
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
Claire
f25414014a
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 20:45:40 +01:00
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