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

Refactor Setting (#3302)

2017-05-25 14:14:36 +02:00

application_extension.rb

Conditional validations no longer accept strings for if/unless (#3124)

2017-05-19 03:11:23 +02:00

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

Skip formatting for cashtag in status text (#3275)

2017-05-24 14:32:53 +02:00

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

createBio function added

2017-06-30 15:03:31 -07:00

hash_object.rb

Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings

2017-01-12 20:46:24 +01:00

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

Whitelist allowed classes for federated statuses (#3810)

2017-06-17 20:26:05 +02:00

status_filter.rb

Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)

2017-06-15 02:00:08 +02:00

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

Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)

2017-04-23 14:19:54 +02:00