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
Claire
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
Claire
711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` ( #31509 )
2024-08-20 13:54:08 +00:00
Claire
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
Claire
d2e4be0456
Hopefully fix notifications pagination flaky test ( #31494 )
2024-08-19 14:53:54 +00:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
Claire
438dac99d6
Add option to request partial accounts in grouped notifications API ( #31299 )
2024-08-06 12:09:35 +00:00
Claire
e67e07211f
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
Claire
da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once ( #31242 )
2024-08-01 12:36:54 +00:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Claire
549ab089ee
Change grouped notifications API shape (take 2) ( #31214 )
2024-07-31 10:50:13 +00:00
Claire
1f796d129d
Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
Ported upstream changes.
2024-07-30 20:47:34 +02:00
Claire
598ae4f2da
Add endpoints for unread notifications count ( #31191 )
2024-07-30 08:39:11 +00:00
Claire
c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports ( #30539 )
2024-07-16 13:23:08 +00:00
Claire
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
Claire
1dd8262071
Add optional `filtered` attribute to notification entities in REST API ( #31011 )
2024-07-15 09:29:57 +00:00
Claire
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
David Roetzel
35a437a03f
Destroy `NotificationRequest`s that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
Claire
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
Matt Jankowski
43e24dbb13
Use `include_pagination_headers` in more places ( #30999 )
2024-07-12 08:30:52 +00:00
Claire
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
Daniel M Brasil
3875bd138d
Fix HTTP 500 in `/api/v1/polls/:id/votes` ( #25598 )
2024-07-09 12:41:49 +00:00
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Matt Jankowski
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00