mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-26 19:31:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/controllers/api
History
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
..
v1 Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
v2 Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 2024-09-16 21:08:58 +02:00
web Move default embed size knowledge into OEmbedSerializer (#31990) 2024-09-20 12:39:48 +00:00
base_controller.rb Add endpoints for unread notifications count (#31191) 2024-07-30 08:39:11 +00:00
oembed_controller.rb Move default embed size knowledge into OEmbedSerializer (#31990) 2024-09-20 12:39:48 +00:00