diff --git a/Changelog.md b/Changelog.md index 636e8f8b1f34ec399c9457d44b33d0bd34f7d7d1..2a7b10223abffa8d065c584738c89422bc8c7f93 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ ## Bug fixes ## Features +* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) # 0.4.1.0 diff --git a/config/defaults.yml b/config/defaults.yml index d94cb7ac6ab35cfae6b7d9df6d62e4f9828ae7b3..01e2599bef4d74b632446f478126bebc5898ce3a 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -41,7 +41,7 @@ defaults: embed_sidekiq_worker: false sidekiq_workers: 1 privacy: - jquery_cdn: true + jquery_cdn: false google_analytics_key: piwik: enable: false diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index 8e8cdbf63bfa863ef3d0be39f6db58da6b529d0f..e3a8ecc9f562b2c207a4a5ac19eb080dffb8eb3e 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -172,11 +172,11 @@ configuration: ## Section ## Settings potentially affecting the privacy of your users privacy: ## Section - ## Include jQuery from jquery.com's CDN (default=true) - ## This can save you some traffic and speeds up load time since most - ## clients already have this one cached. Set this to false if you want - ## the jQuery library to be loaded from your pod's own resources. - #jquery_cdn: true + ## Include jQuery from jquery.com's CDN (default=false) + ## Enabling this can reduce traffic and speed up load time since most + ## clients already have this one cached. When set to false (the default), + ## the jQuery library will be loaded from your pod's own resources. + #jquery_cdn: false ## Google Analytics (disabled by default) ## Provide a key to enable tracking by Google Analytics