mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/controllers/api
History
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
2024-05-06 17:53:51 +02:00
..
v1 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 2024-05-06 17:53:51 +02:00
v2 Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
web Improve spec coverage for api/web/push_subscriptions controller (#27858) 2023-11-15 13:14:51 +00:00
base_controller.rb Add API::Pagination concern (#28826) 2024-04-17 09:22:45 +00:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00