Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Matt Jankowski
67403e7b01
Add coverage for ActivityPub likes/shares endpoints ( #32305 )
2024-10-23 06:41:07 +00:00
Matt Jankowski
0a4a73f9a6
Add coverage for api/v1/domain_blocks/preview endpoint ( #32303 )
2024-10-23 06:40:29 +00:00
Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Matt Jankowski
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
Leni Kadali
4238da6ee3
Add error message when user tries to follow their own account ( #31910 )
2024-10-07 12:05:46 +00:00
Claire
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
Matt Jankowski
cc8d723e71
Register an XML encoder for response tests ( #32220 )
2024-10-03 13:10:27 +00:00
Christian Schmidt
33d3ca7cf1
Support /.well-known/host-meta.json ( #32206 )
2024-10-02 09:23:44 +00:00
David Roetzel
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
cdd7526531
Remove completed TODO note in tags request spec ( #32108 )
2024-09-27 08:22:40 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
28966fa0a6
Remove deprecated v2_alpha endpoint for grouped notifications ( #32089 )
2024-09-25 15:21:11 +00:00
Matt Jankowski
51777fe3e2
Prefer structure checks over multi-line size/parts checks in parsed_body ( #32063 )
2024-09-25 13:54:22 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Matt Jankowski
2b4bda8004
Add response_avatar_link helper to webfinger request spec ( #31999 )
2024-09-23 10:44:52 +00:00
Matt Jankowski
447d0a3e88
Remove double no-records cases in api/v1/admin req specs ( #32014 )
2024-09-23 09:27:53 +00:00
Matt Jankowski
66ed7ea4b5
Move status creation to "with rss" context in accounts request spec ( #32020 )
2024-09-23 09:20:43 +00:00
Matt Jankowski
0ba3ad4a35
Remove body_json_ids from api/v2/admin/accounts spec ( #32003 )
2024-09-23 08:45:05 +00:00
Matt Jankowski
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
d55f4fbda1
Add content type checks to api/v2 request specs ( #31983 )
2024-09-20 13:19:53 +00:00
Matt Jankowski
171394e914
Add coverage for CSV responses for severed relationships ( #31962 )
2024-09-20 13:13:47 +00:00
Matt Jankowski
66326065b0
Add response.content_type checks for JSON to api/v1 request specs ( #31981 )
2024-09-20 13:13:04 +00:00
Matt Jankowski
9a03902ab6
Capture actual behavior in v2/notifications "someone else" dismiss scenario ( #31985 )
2024-09-20 08:16:19 +00:00
Matt Jankowski
5a8f2fe31d
Convert settings/exports controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
Matt Jankowski
b071e618e7
Combine API request spec assertions ( #31970 )
2024-09-19 10:15:21 +00:00
Matt Jankowski
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
Matt Jankowski
eb16763bff
Use have_http_link_header matcher in api/v1/trends/* specs ( #31940 )
2024-09-18 08:22:07 +00:00
Claire
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
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* ( #31840 )
2024-09-16 12:10:02 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
Claire
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
Matt Jankowski
6b6a80b407
Remove body_as_json in favor of built-in response.parsed_body for JSON response specs ( #31749 )
2024-09-06 09:58:46 +00:00
Matt Jankowski
7efe0bde9d
Add have_http_link_header matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
Matt Jankowski
4d5c91e99a
Remove before block in spec with TODOs which have been TO-DONE already ( #31754 )
2024-09-04 19:51:40 +00:00
Claire
cb1eaa10f2
Fix glitch-soc-only tests
2024-09-04 20:07:23 +02:00
Claire
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
Matt Jankowski
e1b5f3fc6f
Use response.parsed_body for html response checks ( #31750 )
2024-09-04 17:29:05 +00:00
Claire
1fcffa573c
Fix 500 error in GET /api/v2_alpha/notifications when there are no notifications to return ( #31746 )
2024-09-04 12:54:15 +00:00
Matt Jankowski
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +00:00
Claire
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
Matt Jankowski
c9ea91f868
Add coverage for api/v1/annual_reports area ( #31730 )
2024-09-03 16:10:48 +00:00
