You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka f513317ba2 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.		6 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
v2	Add more granular OAuth scopes (#7929)	6 years ago
web	Lint pass (#8876)	6 years ago
base_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
oembed_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
push_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
salmon_controller_spec.rb	rubocop issues - Cleaning up (#8912)	6 years ago
subscriptions_controller_spec.rb	rubocop issues - Cleaning up (#8912)	6 years ago