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 eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		7 years ago
..
controllers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
fabricators	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Added FetchRemoteAccountService spec (#6456)	7 years ago
helpers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
lib	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	Redesign the landing page, mount public timeline on it (#4122)	8 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge remote-tracking branch 'origin/master' into merge-upstream	7 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' of https://github.com/tootsuite/mastodon	7 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Isolate each specs for cache store (#6450)	7 years ago
spec_helper.rb	Full-text search for authorized statuses (#6423)	7 years ago