Thibaut Girka c0b876f726 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +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
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