luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
..
v1 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
v2 Migrate to request specs in /api/v2/filters (#25721) 2023-07-27 14:58:20 +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