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 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		7 years ago
..
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
fabricators	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Fix XML oEmbed support discovery (#6104)	7 years ago
helpers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
lib	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mailers	Make text e-mails consistent with HTML ones in UserMailer (#6291)	7 years ago
models	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Add tests for AccountRelationshipsPresenter (#5805)	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	Fix StatusLengthValidator tests	7 years ago
views	fix haml quotes in a bid to make travis less grumpy	7 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Fix force_ssl conditional (#6201)	7 years ago
spec_helper.rb	Minor performance improvement for test suite (#4678)	7 years ago