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 dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master		7 years ago
..
controllers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
fabricators	Add moderation note (#5240)	7 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Custom emoji (#4988)	7 years ago
helpers	Add moderation note (#5240)	7 years ago
lib	Fix un-reblogged status being at wrong position in the home timeline (#5418)	7 years ago
mailers	Spec UserMailer (#3757)	8 years ago
models	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
policies	Add status destroy authorization to policy (#3453)	8 years ago
presenters	Use around hook to restore context in InstancePresenter spec (#3430)	8 years ago
requests	Redesign the landing page, mount public timeline on it (#4122)	7 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 gs-master	7 years ago
support	Some minor change and spec for Account (#3813)	8 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	Follow-up to #4582 and #5027, removing dead code (#5101)	7 years ago
rails_helper.rb	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)	7 years ago
spec_helper.rb	Minor performance improvement for test suite (#4678)	7 years ago