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 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
controllers	Introduce OAuth scopes for bookmarks	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Slightly reduce RAM usage (#7301)	7 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Add test to disallow remote users from fetching local-only toots	6 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago