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
..
activitypub	Handle stream_entry URL correctly in ActivityPub (#4854)	2017-09-08 18:20:03 +02:00
ostatus	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
settings
application_extension.rb
emoji.rb	Change RuboCop rules to loose (#4464)	2017-07-31 15:19:13 +02:00
exceptions.rb	Add callback_url/acct information for Sidekiq PuSH workers Exception. (#4281)	2017-07-27 00:38:20 +02:00
extractor.rb
feed_manager.rb	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
formatter.rb	Don't normalize invalid domain names (#4499)	2017-08-02 14:54:33 +02:00
frontmatter_handler.rb
hash_object.rb
inline_renderer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
language_detector.rb	Fix language filter codes (#4841)	2017-09-08 12:32:22 +02:00
provider_discovery.rb	HTTP signatures (#4146)	2017-07-14 20:41:49 +02:00
request.rb	Add Digest header to requests with body, handle acct and URI keyId (#4565)	2017-08-09 23:54:14 +02:00
sanitize_config.rb
status_filter.rb
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
tag_manager.rb	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
user_settings_decorator.rb	Add unfollow modal (optional) (#4246)	2017-07-18 17:14:43 +02:00
webfinger_resource.rb