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
..
exports	…
two_factor_authentication	Use raw status code on have_http_status (#7214)	7 years ago
applications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
deletes_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
exports_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
flavours_controller_spec.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
keyword_mutes_controller_spec.rb	Set up /settings/keyword_mutes. #164.	7 years ago
migrations_controller_spec.rb	Add tests for migrations_controller (#7707)	7 years ago
notifications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
preferences_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
profiles_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	7 years ago
two_factor_authentications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago