mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 05:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/spec/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 Fix /api/v2/search not working with following query param (#25681) 2023-07-03 18:06:57 +02:00
web Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
base_controller_spec.rb Fix RSpec/StubbedMock cop (#25552) 2023-07-12 10:20:10 +02:00
oembed_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00