fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-27 10:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
v2 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
web Lint pass (#8876) 2018-10-04 12:36:53 +02:00
base_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
oembed_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
proofs_controller_spec.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
push_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
salmon_controller_spec.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
subscriptions_controller_spec.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00