tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
98bb6815a7
mastodon/spec/controllers/api
History
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
2018-10-05 15:23:57 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02: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
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 Update Rails (#8141) 2018-08-13 18:17:20 +02:00
subscriptions_controller_spec.rb Update Rails (#8141) 2018-08-13 18:17:20 +02:00