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
6d2986017e
Remove unused `active_nav_class` helper method ( #29617 )
2024-03-18 13:24:59 +00:00
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
92855948a0
Remove unused `show_landing_strip?` helper method ( #29618 )
2024-03-18 08:55:54 +00:00
ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods ( #29620 )
2024-03-18 08:54:46 +00:00
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
2e91a9bd34
Add `include_pagination_headers` matcher to check `Link` header in api specs ( #29596 )
2024-03-15 10:17:45 +00:00
e75b55a6d7
Extract target account on list method in bulk import row service spec ( #29601 )
2024-03-15 09:31:25 +00:00
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
974c7672e5
Extract shared behavior methods in oauth feature spec ( #28360 )
2024-03-14 13:42:59 +00:00
0bc17a3d48
Use enum-generated `public_visibility` scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
681a89f684
Readability clean up in `ImportVacuum` spec ( #28955 )
2024-03-14 09:24:00 +00:00
f9100743ec
Add `Api::ErrorHandling` concern for api/base controller ( #29574 )
2024-03-14 09:09:47 +00:00
42875fee52
Add coverage for bad args/options in `CLI::Domains#purge` ( #29578 )
2024-03-14 08:58:53 +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
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
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
71e5f0f48c
Add coverage for suspended instance actor scenario ( #29571 )
2024-03-13 15:43:40 +00: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
46e902f1f3
Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )
2024-03-13 09:22:43 +00:00
01b624c4a0
Use `normalizes` on `CustomFilter#context` value ( #27602 )
2024-03-13 08:50:21 +00:00
71eecbfa1f
Move `api/v2/filters/*` to request spec ( #28956 )
2024-03-13 08:47:09 +00:00
8349b45d60
Accept extra args that we wont verify in `ap/activity/add_spec` ( #29005 )
2024-03-13 08:46:11 +00:00
469028b6d3
Remove unneeded `type: :service` from spec/services files ( #29304 )
2024-03-13 08:39:26 +00:00
3eaac3af73
Use `before_all` block to setup `requests/cache_spec` data ( #29437 )
2024-03-13 08:38:57 +00:00
19f0590795
Add basic coverage for `TagSearchService` class ( #29319 )
2024-03-13 08:33:03 +00:00
96013cd576
Reduce `RSpec/ExampleLength` in CSP request spec ( #29104 )
2024-03-13 08:22:32 +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
24319836de
Convert request-based setup into factory setup in push/subscriptions request spec ( #29489 )
2024-03-11 15:46:25 +00:00
a38e424185
Use unchanging github links in docs/comments ( #29545 )
2024-03-11 15:14:55 +00: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
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
98ef38e34e
Ensure unique values in fabricators ( #29515 )
2024-03-11 08:53:24 +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
18945f62e0
Convert more API specs from controller->request style ( #29004 )
2024-03-01 16:24:45 +00: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
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
eb1b8f69de
Allow pagination `Link` headers on API accounts/statuses when pinned true ( #29442 )
2024-02-29 14:21:56 +00:00
6675bf574a
Extract `parsed_uri_query_values` helper in ap/replies controller spec ( #29410 )
2024-02-29 13:47:38 +00:00
Claire
Matt Jankowski
Eugen Rochko
Jeong Arm
Daniel M Brasil