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/spec/controllers/api
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
v2
web
base_controller_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
oembed_controller_spec.rb Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
proofs_controller_spec.rb