David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream ...

Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb

2017-09-09 14:27:47 -05:00

..

controllers

Raise an error for remote url in StatusFinder (#4776)

2017-09-02 17:42:47 +02:00

fabricators

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

features

Add scenarios for log in (#3497)

2017-06-01 17:25:59 +02:00

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

Raise an error for remote url in StatusFinder (#4776)

2017-09-02 17:42:47 +02:00

mailers

Spec UserMailer (#3757)

2017-06-17 01:15:00 +02:00

models

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

policies

Add status destroy authorization to policy (#3453)

2017-05-30 22:56:31 +02:00

presenters

Use around hook to restore context in InstancePresenter spec (#3430)

2017-05-30 09:03:35 -04:00

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

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +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