David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream		2017-09-09 14:28:08 -05:00
..
controllers	Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)	2017-09-05 17:48:13 +02:00
fabricators	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
features
fixtures	Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)	2017-07-08 22:44:31 +02:00
helpers	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
javascript	feat: Cache status height to avoid expensive renders (#4439)	2017-08-07 20:32:03 +02:00
lib	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
mailers
models	Merge tag 'v1.6.0rc3' into sync/upstream	2017-09-09 14:28:08 -05:00
policies
presenters
requests	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
routing
services	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
support
validators	Fix StatusLengthValidator tests	2017-09-02 11:37:40 -05:00
views	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
workers	Add configuration to disable private status federation over PuSH (#4582)	2017-08-24 17:51:32 +02:00
rails_helper.rb	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)	2017-07-07 23:25:15 +02:00
spec_helper.rb	Minor performance improvement for test suite (#4678)	2017-08-24 13:31:55 +02:00