FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/api
History
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
 		2023-07-17 19:02:23 +02:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
web Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
base_controller.rb Fix anonymous visitors getting a session cookie on first visit (#24584) 2023-04-25 16:51:38 +02:00
oembed_controller.rb
…