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 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		7 years ago
..
controllers	Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)	7 years ago
fabricators	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	7 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)	7 years ago
helpers	Fix language filter codes (#4841)	7 years ago
javascript	feat: Cache status height to avoid expensive renders (#4439)	7 years ago
lib	Handle stream_entry URL correctly in ActivityPub (#4854)	7 years ago
mailers	Spec UserMailer (#3757)	8 years ago
models	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	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	Fix errors preventing UnsubscribeService from working (#4866)	7 years ago
support	Some minor change and spec for Account (#3813)	8 years ago
validators	Fix StatusLengthValidator tests	7 years ago
views	Merge branch 'origin/master' into sync/upstream	7 years ago
workers	Add configuration to disable private status federation over PuSH (#4582)	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