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.

David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		7 years ago
..
v1	Merge branch 'master' into glitch-soc/merge	7 years ago
web	Add tests for embeds controller (#7719)	7 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	Use raw status code on have_http_status (#7214)	7 years ago
subscriptions_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago