luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-18 21:44:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Claire 8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
..
v1 Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 2023-06-10 17:18:36 +02:00
v2 Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
web Fix RSpec/MultipleSubjects cop (#24738) 2023-05-04 05:48:35 +02:00
base_controller_spec.rb Fix Lint/ConstantDefinitionInBlock cop (#24763) 2023-05-03 10:32:30 +02:00
oembed_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00