Skip to content

Commit d3bc214

Browse files
author
Rafael Mendonça França
committed
Merge branch 'master' into 3-1-stable
2 parents 7ae3bec + 4bc300a commit d3bc214

File tree

9 files changed

+451
-426
lines changed

9 files changed

+451
-426
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 3.1.1 (23 June 2014)
2+
3+
- Updated to jQuery 1.11.1
4+
- Updated to jquery-ujs 1.0.0
5+
16
## 3.1.0 (29 January 2014)
27

38
- Updated to jQuery 1.11.0
@@ -7,7 +12,7 @@
712
## 3.0.4 (10 July 2013)
813

914
- Fixed jQuery source map
10-
15+
1116
## 3.0.3 (10 July 2013)
1217

1318
- Updated to jQuery 1.10.2

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jQuery! For Rails! So great.
44

55
This gem provides:
66

7-
* jQuery 1.11.0
7+
* jQuery 1.11.1
88
* the jQuery UJS adapter
99
* assert_select_jquery to test jQuery responses in Ruby tests
1010

‎VERSIONS.md

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
11
# Bundled Versions
22

3-
| Gem | jQuery | jQuery UI |
4-
|--------|--------|-----------|
5-
| 3.1.0 | 1.11.0 | - |
6-
| 3.0.5 | 1.11.0 | - |
7-
| 3.0.4 | ↾ | - |
8-
| 3.0.3 | 1.10.2 | - |
9-
| 3.0.2 | ↾ | - |
10-
| 3.0.1 | 1.10.1 | - |
11-
| 3.0.0 | ↾ | - |
12-
| 2.3.0 | 1.10.0 | 1.10.3 |
13-
| 2.2.2 | ↾ | ↾ |
14-
| 2.2.1 | 1.9.1 | ↾ |
15-
| 2.2.0 | 1.9.0 | ↾ |
16-
| 2.1.4 | 1.8.3 | 1.9.2 |
17-
| 2.1.3 | 1.8.2 | ↾ |
18-
| 2.1.2 | 1.8.1 | ↾ |
19-
| 2.1.1 | ↾ | ↾ |
20-
| 2.1.0 | 1.8.0 | 1.8.23 |
21-
| 2.0.3 | ↾ | ↾ |
22-
| 2.0.2 | 1.7.2 | 1.8.18 |
23-
| 2.0.1 | ↾ | ↾ |
24-
| 2.0.0 | ↾ | ↾ |
25-
| 1.0.19 | 1.7.1 | ↾ |
26-
| 1.0.18 | ↾ | ↾ |
27-
| 1.0.17 | 1.7.0 | ↾ |
28-
| 1.0.16 | 1.6.4 | 1.8.16 |
29-
| 1.0.15 | ↾ | ↾ |
30-
| 1.0.14 | ↾ | ↾ |
31-
| 1.0.13 | 1.6.2 | 1.8.14 |
32-
| 1.0.12 | ↾ | ↾ |
33-
| 1.0.11 | ↾ | ↾ |
34-
| 1.0.10 | ↾ | ↾ |
35-
| 1.0.9 | ↾ | ↾ |
36-
| 1.0.8 | ↾ | ↾ |
37-
| 1.0.7 | ↾ | ↾ |
38-
| 1.0.6 | ↾ | ↾ |
39-
| 1.0.5 | ↾ | ↾ |
40-
| 1.0.4 | ↾ | ↾ |
41-
| 1.0.3 | 1.6.1 | ↾ |
42-
| 1.0.2 | ↾ | ↾ |
43-
| 1.0.1 | ↾ | 1.8.12 |
44-
| 1.0.0 | 1.6.0 | - |
3+
| Gem | jQuery | jQuery UJS | jQuery UI |
4+
|--------|--------|------------| ----------|
5+
| 3.1.1 | 1.11.1 | 1.0.0 | - |
6+
| 3.1.0 | 1.11.0 | - | - |
7+
| 3.0.5 | 1.11.0 | - | - |
8+
| 3.0.4 | ↾ | - | - |
9+
| 3.0.3 | 1.10.2 | - | - |
10+
| 3.0.2 | ↾ | - | - |
11+
| 3.0.1 | 1.10.1 | - | - |
12+
| 3.0.0 | ↾ | - | - |
13+
| 2.3.0 | 1.10.0 | - | 1.10.3 |
14+
| 2.2.2 | ↾ | - | ↾ |
15+
| 2.2.1 | 1.9.1 | - | ↾ |
16+
| 2.2.0 | 1.9.0 | - | ↾ |
17+
| 2.1.4 | 1.8.3 | - | 1.9.2 |
18+
| 2.1.3 | 1.8.2 | - | ↾ |
19+
| 2.1.2 | 1.8.1 | - | ↾ |
20+
| 2.1.1 | ↾ | - | ↾ |
21+
| 2.1.0 | 1.8.0 | - | 1.8.23 |
22+
| 2.0.3 | ↾ | - | ↾ |
23+
| 2.0.2 | 1.7.2 | - | 1.8.18 |
24+
| 2.0.1 | ↾ | - | ↾ |
25+
| 2.0.0 | ↾ | - | ↾ |
26+
| 1.0.19 | 1.7.1 | - | ↾ |
27+
| 1.0.18 | ↾ | - | ↾ |
28+
| 1.0.17 | 1.7.0 | - | ↾ |
29+
| 1.0.16 | 1.6.4 | - | 1.8.16 |
30+
| 1.0.15 | ↾ | - | ↾ |
31+
| 1.0.14 | ↾ | - | ↾ |
32+
| 1.0.13 | 1.6.2 | - | 1.8.14 |
33+
| 1.0.12 | ↾ | - | ↾ |
34+
| 1.0.11 | ↾ | - | ↾ |
35+
| 1.0.10 | ↾ | - | ↾ |
36+
| 1.0.9 | ↾ | - | ↾ |
37+
| 1.0.8 | ↾ | - | ↾ |
38+
| 1.0.7 | ↾ | - | ↾ |
39+
| 1.0.6 | ↾ | - | ↾ |
40+
| 1.0.5 | ↾ | - | ↾ |
41+
| 1.0.4 | ↾ | - | ↾ |
42+
| 1.0.3 | 1.6.1 | - | ↾ |
43+
| 1.0.2 | ↾ | - | ↾ |
44+
| 1.0.1 | ↾ | - | 1.8.12 |
45+
| 1.0.0 | 1.6.0 | - | - |

‎jquery-rails.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
88
s.authors = ["André Arko"]
99
s.email = ["andre@arko.net"]
1010
s.homepage = "http://rubygems.org/gems/jquery-rails"
11-
s.summary = "Use jQuery with Rails 3"
12-
s.description = "This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application."
11+
s.summary = "Use jQuery with Rails 3+"
12+
s.description = "This gem provides jQuery and the jQuery-ujs driver for your Rails 3+ application."
1313
s.license = "MIT"
1414

1515
s.required_rubygems_version = ">= 1.3.6"

‎lib/jquery/rails/version.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Jquery
22
module Rails
3-
VERSION = "3.1.0"
4-
JQUERY_VERSION = "1.11.0"
5-
JQUERY_UJS_VERSION = "f160fa2f4615f93e1a0d75e49de59d19c18c8728"
3+
VERSION = "3.1.1"
4+
JQUERY_VERSION = "1.11.1"
5+
JQUERY_UJS_VERSION = "1.0.0"
66
end
77
end

0 commit comments

Comments
 (0)