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 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
..
v1 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
v2 Extract shared examples from api specs (#25387) 2023-06-14 09:34:01 +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