Merge branch 'master' into 3-1-stable

rails · Aug 27, 2014 · d3bc214 · d3bc214
2 parents 7ae3bec + 4bc300a
commit d3bc214
Show file tree

Hide file tree

Showing 9 changed files with 451 additions and 426 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.1.1 (23 June 2014)
+
+  - Updated to jQuery 1.11.1
+  - Updated to jquery-ujs 1.0.0
+
 ## 3.1.0 (29 January 2014)
 
   - Updated to jQuery 1.11.0
@@ -7,7 +12,7 @@
 ## 3.0.4 (10 July 2013)
 
   - Fixed jQuery source map
- 
+
 ## 3.0.3 (10 July 2013)
 
   - Updated to jQuery 1.10.2

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ jQuery! For Rails! So great.
 
 This gem provides:
 
-  * jQuery 1.11.0
+  * jQuery 1.11.1
   * the jQuery UJS adapter
   * assert_select_jquery to test jQuery responses in Ruby tests
 

diff --git a/VERSIONS.md b/VERSIONS.md
@@ -1,44 +1,45 @@
 # Bundled Versions
 
-| Gem    | jQuery | jQuery UI |
-|--------|--------|-----------|
-| 3.1.0  | 1.11.0 | -         |
-| 3.0.5  | 1.11.0 | -         |
-| 3.0.4  | ↾      | -         |
-| 3.0.3  | 1.10.2 | -         |
-| 3.0.2  | ↾      | -         |
-| 3.0.1  | 1.10.1 | -         |
-| 3.0.0  | ↾      | -         |
-| 2.3.0  | 1.10.0 | 1.10.3    |
-| 2.2.2  | ↾      | ↾         |
-| 2.2.1  | 1.9.1  | ↾         |
-| 2.2.0  | 1.9.0  | ↾         |
-| 2.1.4  | 1.8.3  | 1.9.2     |
-| 2.1.3  | 1.8.2  | ↾         |
-| 2.1.2  | 1.8.1  | ↾         |
-| 2.1.1  | ↾      | ↾         |
-| 2.1.0  | 1.8.0  | 1.8.23    |
-| 2.0.3  | ↾      | ↾         |
-| 2.0.2  | 1.7.2  | 1.8.18    |
-| 2.0.1  | ↾      | ↾         |
-| 2.0.0  | ↾      | ↾         |
-| 1.0.19 | 1.7.1  | ↾         |
-| 1.0.18 | ↾      | ↾         |
-| 1.0.17 | 1.7.0  | ↾         |
-| 1.0.16 | 1.6.4  | 1.8.16    |
-| 1.0.15 | ↾      | ↾         |
-| 1.0.14 | ↾      | ↾         |
-| 1.0.13 | 1.6.2  | 1.8.14    |
-| 1.0.12 | ↾      | ↾         |
-| 1.0.11 | ↾      | ↾         |
-| 1.0.10 | ↾      | ↾         |
-| 1.0.9  | ↾      | ↾         |
-| 1.0.8  | ↾      | ↾         |
-| 1.0.7  | ↾      | ↾         |
-| 1.0.6  | ↾      | ↾         |
-| 1.0.5  | ↾      | ↾         |
-| 1.0.4  | ↾      | ↾         |
-| 1.0.3  | 1.6.1  | ↾         |
-| 1.0.2  | ↾      | ↾         |
-| 1.0.1  | ↾      | 1.8.12    |
-| 1.0.0  | 1.6.0  | -         |
+| Gem    | jQuery | jQuery UJS | jQuery UI |
+|--------|--------|------------| ----------|
+| 3.1.1  | 1.11.1 | 1.0.0      | -         |
+| 3.1.0  | 1.11.0 | -          | -         |
+| 3.0.5  | 1.11.0 | -          | -         |
+| 3.0.4  | ↾      | -          | -         |
+| 3.0.3  | 1.10.2 | -          | -         |
+| 3.0.2  | ↾      | -          | -         |
+| 3.0.1  | 1.10.1 | -          | -         |
+| 3.0.0  | ↾      | -          | -         |
+| 2.3.0  | 1.10.0 | -          | 1.10.3    |
+| 2.2.2  | ↾      | -          | ↾         |
+| 2.2.1  | 1.9.1  | -          | ↾         |
+| 2.2.0  | 1.9.0  | -          | ↾         |
+| 2.1.4  | 1.8.3  | -          | 1.9.2     |
+| 2.1.3  | 1.8.2  | -          | ↾         |
+| 2.1.2  | 1.8.1  | -          | ↾         |
+| 2.1.1  | ↾      | -          | ↾         |
+| 2.1.0  | 1.8.0  | -          | 1.8.23    |
+| 2.0.3  | ↾      | -          | ↾         |
+| 2.0.2  | 1.7.2  | -          | 1.8.18    |
+| 2.0.1  | ↾      | -          | ↾         |
+| 2.0.0  | ↾      | -          | ↾         |
+| 1.0.19 | 1.7.1  | -          | ↾         |
+| 1.0.18 | ↾      | -          | ↾         |
+| 1.0.17 | 1.7.0  | -          | ↾         |
+| 1.0.16 | 1.6.4  | -          | 1.8.16    |
+| 1.0.15 | ↾      | -          | ↾         |
+| 1.0.14 | ↾      | -          | ↾         |
+| 1.0.13 | 1.6.2  | -          | 1.8.14    |
+| 1.0.12 | ↾      | -          | ↾         |
+| 1.0.11 | ↾      | -          | ↾         |
+| 1.0.10 | ↾      | -          | ↾         |
+| 1.0.9  | ↾      | -          | ↾         |
+| 1.0.8  | ↾      | -          | ↾         |
+| 1.0.7  | ↾      | -          | ↾         |
+| 1.0.6  | ↾      | -          | ↾         |
+| 1.0.5  | ↾      | -          | ↾         |
+| 1.0.4  | ↾      | -          | ↾         |
+| 1.0.3  | 1.6.1  | -          | ↾         |
+| 1.0.2  | ↾      | -          | ↾         |
+| 1.0.1  | ↾      | -          | 1.8.12    |
+| 1.0.0  | 1.6.0  | -          | -         |
diff --git a/jquery-rails.gemspec b/jquery-rails.gemspec
@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["André Arko"]
   s.email       = ["[email protected]"]
   s.homepage    = "http://rubygems.org/gems/jquery-rails"
-  s.summary     = "Use jQuery with Rails 3"
-  s.description = "This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application."
+  s.summary     = "Use jQuery with Rails 3+"
+  s.description = "This gem provides jQuery and the jQuery-ujs driver for your Rails 3+ application."
   s.license     = "MIT"
 
   s.required_rubygems_version = ">= 1.3.6"

diff --git a/lib/jquery/rails/version.rb b/lib/jquery/rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Rails
-    VERSION = "3.1.0"
-    JQUERY_VERSION = "1.11.0"
-    JQUERY_UJS_VERSION = "f160fa2f4615f93e1a0d75e49de59d19c18c8728"
+    VERSION = "3.1.1"
+    JQUERY_VERSION = "1.11.1"
+    JQUERY_UJS_VERSION = "1.0.0"
   end
 end