This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		2017-09-09 23:56:21 -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	Fix language filter codes (#4841)	2017-09-08 12:32:22 +02:00
javascript	feat: Cache status height to avoid expensive renders (#4439)	2017-08-07 20:32:03 +02:00
lib	Handle stream_entry URL correctly in ActivityPub (#4854)	2017-09-08 18:20:03 +02:00
mailers	Spec UserMailer (#3757)	2017-06-17 01:15:00 +02:00
models	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	2017-09-09 23:56:21 -05:00
policies	…
presenters	…
requests	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	2017-06-10 09:39:26 +02:00
services	Fix errors preventing UnsubscribeService from working (#4866)	2017-09-09 17:36:27 +02:00
support	Some minor change and spec for Account (#3813)	2017-06-22 18:34:27 +02:00
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