nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5105 from goobertron/jquery_default

Browse source 
Change default for jQuery CDN to false
This commit is contained in:
Jonne Haß 2014-08-24 13:35:53 +02:00
commit a1e547f8d7
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -5,6 +5,7 @@
## Bug fixes ## Bug fixes
## Features ## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
# 0.4.1.0 # 0.4.1.0

2
config/defaults.yml
View file

@ -41,7 +41,7 @@ defaults:
embed_sidekiq_worker: false embed_sidekiq_worker: false
sidekiq_workers: 1 sidekiq_workers: 1
privacy: privacy:
jquery_cdn: true jquery_cdn: false
google_analytics_key: google_analytics_key:
piwik: piwik:
enable: false enable: false

10
config/diaspora.yml.example
View file

@ -172,11 +172,11 @@ configuration: ## Section
## Settings potentially affecting the privacy of your users ## Settings potentially affecting the privacy of your users
privacy: ## Section privacy: ## Section
## Include jQuery from jquery.com's CDN (default=true) ## Include jQuery from jquery.com's CDN (default=false)
## This can save you some traffic and speeds up load time since most ## Enabling this can reduce traffic and speed up load time since most
## clients already have this one cached. Set this to false if you want ## clients already have this one cached. When set to false (the default),
## the jQuery library to be loaded from your pod's own resources. ## the jQuery library will be loaded from your pod's own resources.
#jquery_cdn: true #jquery_cdn: false
## Google Analytics (disabled by default) ## Google Analytics (disabled by default)
## Provide a key to enable tracking by Google Analytics ## Provide a key to enable tracking by Google Analytics