Commit Graph

279 Commits

Author SHA1 Message Date
Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict due to upstream adding fallback support for MathML Core while
  glitch-soc supported slightly more tags than upstream.
  Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
  Ditto.
2024-12-01 18:22:00 +01:00
Eugen Rochko 48f3ed738f
Fix list error messages (#33082) 2024-11-28 10:13:06 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Emelia Smith 2bd56f726a
Add client_secret_expires_at to OAuth Applications (#30317) 2024-11-12 22:06:13 +00:00
Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Emelia Smith d94a367aeb
Add test coverage for POST /api/v2/media's max description length (#32683) 2024-10-29 09:25:38 +00:00
Jonny Saunders 9074c1fac9
Use `likes` and `shares` totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00
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 0a4a73f9a6
Add coverage for `api/v1/domain_blocks/preview` endpoint (#32303) 2024-10-23 06:40:29 +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 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 447d0a3e88
Remove double no-records cases in `api/v1/admin` req specs (#32014) 2024-09-23 09:27:53 +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 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 b071e618e7
Combine API request spec assertions (#31970) 2024-09-19 10:15:21 +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 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 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
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
Matt Jankowski 8922786ef4
Fix `RSpec/LetSetup` cop in api/v1/timelines/tag spec (#30796) 2024-09-03 15:32:12 +00:00
Matt Jankowski ef4920c6c9
Pull out https/hostname setup for request specs to shared config (#31622) 2024-09-03 15:28:57 +00:00
Claire ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` (#31725) 2024-09-03 14:32:26 +00:00
Claire ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
Matt Jankowski 24a0b20408
Use `body_as_json` directly instead of via local var assignment (#31696) 2024-09-03 08:03:08 +00:00
Claire 402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
Matt Jankowski 40f993b3a0
Use built-in `response.parsed_body` for JSON response specs (#31674) 2024-09-02 14:25:21 +00:00
Claire 6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Claire ad0a28a8bf
Add `grouped_types` parameter to allow clients to restrict which notifications types get grouped (#31594) 2024-08-29 12:39:07 +00:00
Claire 94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Matt Jankowski 38a3466741
Convert `api/oembed` controller spec to request spec (#31605) 2024-08-27 07:55:25 +00:00
Matt Jankowski c09d232ee3
Convert `api/web/settings` controller spec to request spec (#31606) 2024-08-27 07:42:35 +00:00
Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
Claire 19a1acb38b
Add `api_versions` to `/api/v2/instance` (#31354) 2024-08-21 14:54:59 +00:00