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
34489591ec
Add `max_pinned_statuses` to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
71eecbfa1f
Move `api/v2/filters/*` to request spec ( #28956 )
2024-03-13 08:47:09 +00:00
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
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
b6baab447d
Move `api/v2/admin/accounts` to request spec ( #28950 )
2024-01-26 17:41:13 +00:00
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
6c00d5b0c4
Fix test failure caused by glitch-soc changes
2023-12-19 21:14:39 +01:00
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
2023-12-19 10:55:39 +00:00
0e4233de9d
Controller spec to request spec: `api/v2/suggestions` ( #28297 )
2023-12-11 08:13:57 +00:00
7e514688b3
Convert `api/v2/search` controller spec to request spec ( #28269 )
2023-12-08 09:27:33 +00:00
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
2023-11-22 15:39:34 +00:00
32e19e3af6
Reduce `.times` usage in request and controller specs ( #27949 )
2023-11-21 13:05:59 +00:00
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:28 +00:00
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
2023-11-20 08:48:56 +00:00
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
2023-11-06 14:28:20 +00:00
812a84ff5f
Migrate to request specs in `/api/v2/filters` ( #25721 )
2023-07-27 14:58:20 +02:00
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
Matt Jankowski
Daniel M Brasil