Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit 7d6cc88

Browse files
committed
Update the gem version to 0.9.6
1 parent 36b8938 commit 7d6cc88

File tree

3 files changed

+84
-63
lines changed

3 files changed

+84
-63
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## requirejs-rails changelog
44

5+
### v0.9.6
6+
7+
- Update `require.js` and `r.js` to `2.1.17`, and `almond.js` to `0.3.1`.
8+
- Improve handling of Bower packages.
9+
- Make a small fix for Sprockets 3 support.
10+
511
### v0.9.5
612

713
- Update `require.js` and `r.js` to `2.1.15`, and `almond.js` to `0.3.0`.

Gemfile.lock

Lines changed: 77 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,106 @@
11
PATH
22
remote: .
33
specs:
4-
requirejs-rails (0.9.5)
4+
requirejs-rails (0.9.6)
55
railties (>= 3.1.1)
66

77
GEM
88
remote: http://rubygems.org/
99
specs:
10-
actionmailer (4.1.1)
11-
actionpack (= 4.1.1)
12-
actionview (= 4.1.1)
13-
mail (~> 2.5.4)
14-
actionpack (4.1.1)
15-
actionview (= 4.1.1)
16-
activesupport (= 4.1.1)
17-
rack (~> 1.5.2)
10+
actionmailer (4.2.1)
11+
actionpack (= 4.2.1)
12+
actionview (= 4.2.1)
13+
activejob (= 4.2.1)
14+
mail (~> 2.5, >= 2.5.4)
15+
rails-dom-testing (~> 1.0, >= 1.0.5)
16+
actionpack (4.2.1)
17+
actionview (= 4.2.1)
18+
activesupport (= 4.2.1)
19+
rack (~> 1.6)
1820
rack-test (~> 0.6.2)
19-
actionview (4.1.1)
20-
activesupport (= 4.1.1)
21+
rails-dom-testing (~> 1.0, >= 1.0.5)
22+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
23+
actionview (4.2.1)
24+
activesupport (= 4.2.1)
2125
builder (~> 3.1)
2226
erubis (~> 2.7.0)
23-
activemodel (4.1.1)
24-
activesupport (= 4.1.1)
27+
rails-dom-testing (~> 1.0, >= 1.0.5)
28+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
29+
activejob (4.2.1)
30+
activesupport (= 4.2.1)
31+
globalid (>= 0.3.0)
32+
activemodel (4.2.1)
33+
activesupport (= 4.2.1)
2534
builder (~> 3.1)
26-
activerecord (4.1.1)
27-
activemodel (= 4.1.1)
28-
activesupport (= 4.1.1)
29-
arel (~> 5.0.0)
30-
activesupport (4.1.1)
31-
i18n (~> 0.6, >= 0.6.9)
35+
activerecord (4.2.1)
36+
activemodel (= 4.2.1)
37+
activesupport (= 4.2.1)
38+
arel (~> 6.0)
39+
activesupport (4.2.1)
40+
i18n (~> 0.7)
3241
json (~> 1.7, >= 1.7.7)
3342
minitest (~> 5.1)
34-
thread_safe (~> 0.1)
43+
thread_safe (~> 0.3, >= 0.3.4)
3544
tzinfo (~> 1.1)
36-
arel (5.0.1.20140414130214)
45+
arel (6.0.0)
3746
builder (3.2.2)
3847
erubis (2.7.0)
39-
execjs (2.2.0)
40-
hike (1.2.3)
41-
i18n (0.6.9)
42-
jquery-rails (3.1.1)
43-
railties (>= 3.0, < 5.0)
48+
execjs (2.5.2)
49+
globalid (0.3.5)
50+
activesupport (>= 4.1.0)
51+
i18n (0.7.0)
52+
jquery-rails (4.0.3)
53+
rails-dom-testing (~> 1.0)
54+
railties (>= 4.2.0)
4455
thor (>= 0.14, < 2.0)
45-
json (1.8.1)
46-
mail (2.5.4)
47-
mime-types (~> 1.16)
48-
treetop (~> 1.4.8)
49-
mime-types (1.25.1)
50-
minitest (5.3.5)
51-
multi_json (1.10.1)
52-
polyglot (0.3.5)
53-
rack (1.5.2)
54-
rack-test (0.6.2)
56+
json (1.8.2)
57+
loofah (2.0.1)
58+
nokogiri (>= 1.5.9)
59+
mail (2.6.3)
60+
mime-types (>= 1.16, < 3)
61+
mime-types (2.5)
62+
mini_portile (0.6.2)
63+
minitest (5.6.1)
64+
nokogiri (1.6.6.2)
65+
mini_portile (~> 0.6.0)
66+
rack (1.6.0)
67+
rack-test (0.6.3)
5568
rack (>= 1.0)
56-
rails (4.1.1)
57-
actionmailer (= 4.1.1)
58-
actionpack (= 4.1.1)
59-
actionview (= 4.1.1)
60-
activemodel (= 4.1.1)
61-
activerecord (= 4.1.1)
62-
activesupport (= 4.1.1)
69+
rails (4.2.1)
70+
actionmailer (= 4.2.1)
71+
actionpack (= 4.2.1)
72+
actionview (= 4.2.1)
73+
activejob (= 4.2.1)
74+
activemodel (= 4.2.1)
75+
activerecord (= 4.2.1)
76+
activesupport (= 4.2.1)
6377
bundler (>= 1.3.0, < 2.0)
64-
railties (= 4.1.1)
65-
sprockets-rails (~> 2.0)
66-
railties (4.1.1)
67-
actionpack (= 4.1.1)
68-
activesupport (= 4.1.1)
78+
railties (= 4.2.1)
79+
sprockets-rails
80+
rails-deprecated_sanitizer (1.0.3)
81+
activesupport (>= 4.2.0.alpha)
82+
rails-dom-testing (1.0.6)
83+
activesupport (>= 4.2.0.beta, < 5.0)
84+
nokogiri (~> 1.6.0)
85+
rails-deprecated_sanitizer (>= 1.0.1)
86+
rails-html-sanitizer (1.0.2)
87+
loofah (~> 2.0)
88+
railties (4.2.1)
89+
actionpack (= 4.2.1)
90+
activesupport (= 4.2.1)
6991
rake (>= 0.8.7)
7092
thor (>= 0.18.1, < 2.0)
71-
rake (10.3.2)
72-
sprockets (2.12.1)
73-
hike (~> 1.2)
74-
multi_json (~> 1.0)
93+
rake (10.4.2)
94+
sprockets (3.0.3)
7595
rack (~> 1.0)
76-
tilt (~> 1.1, != 1.3.0)
77-
sprockets-rails (2.1.3)
96+
sprockets-rails (2.2.4)
7897
actionpack (>= 3.0)
7998
activesupport (>= 3.0)
80-
sprockets (~> 2.8)
81-
sqlite3 (1.3.9)
99+
sprockets (>= 2.8, < 4.0)
100+
sqlite3 (1.3.10)
82101
thor (0.19.1)
83-
thread_safe (0.3.4)
84-
tilt (1.4.1)
85-
treetop (1.4.15)
86-
polyglot
87-
polyglot (>= 0.3.1)
88-
tzinfo (1.2.1)
102+
thread_safe (0.3.5)
103+
tzinfo (1.2.2)
89104
thread_safe (~> 0.1)
90105

91106
PLATFORMS

lib/requirejs/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Requirejs
22
module Rails
3-
Version = "0.9.5"
3+
Version = "0.9.6"
44
LibVersion = "2.1.17"
55
end
66
end

0 commit comments

Comments
 (0)