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 cf8121376b Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
v1	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
v2	Add more granular OAuth scopes (#7929)	6 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