Merge pull request #699 from nikolas/jquery-2.1.3

Update default jquery to 2.1.4
jazzband · May 27, 2015 · 9d49009 · 9d49009
2 parents 106e9cf + 0c29e5c
commit 9d49009
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
@@ -19,7 +19,7 @@
     # Toolbar options
     'DISABLE_PANELS': set(['debug_toolbar.panels.redirects.RedirectsPanel']),
     'INSERT_BEFORE': '</body>',
-    'JQUERY_URL': '//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js',
+    'JQUERY_URL': '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js',
     'RENDER_PANELS': None,
     'RESULTS_CACHE_SIZE': 10,
     'ROOT_TAG_EXTRA_ATTRS': '',

diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -73,7 +73,7 @@ Toolbar options
 
 * ``JQUERY_URL``
 
-  Default: ``'//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js'``
+  Default: ``'//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'``
 
   URL of the copy of jQuery that will be used by the toolbar. Set it to a
   locally-hosted version of jQuery for offline development. Make it empty to