Skip to content

Commit e01c7ea

Browse files
authored
Merge pull request #49 from kwi/dependabot/bundler/rails-3.2.17
Bump rails from 3.2.1 to 3.2.17
2 parents 481b5d7 + 1afd108 commit e01c7ea

File tree

2 files changed

+55
-53
lines changed

2 files changed

+55
-53
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "http://rubygems.org"
2-
gem 'rails', '3.2.1'
2+
gem 'rails', '3.2.17'
33
gem 'rspec', '>=2.8.0'

Gemfile.lock

+54-52
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,73 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
actionmailer (3.2.1)
5-
actionpack (= 3.2.1)
6-
mail (~> 2.4.0)
7-
actionpack (3.2.1)
8-
activemodel (= 3.2.1)
9-
activesupport (= 3.2.1)
4+
actionmailer (3.2.17)
5+
actionpack (= 3.2.17)
6+
mail (~> 2.5.4)
7+
actionpack (3.2.17)
8+
activemodel (= 3.2.17)
9+
activesupport (= 3.2.17)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
12-
journey (~> 1.0.1)
13-
rack (~> 1.4.0)
14-
rack-cache (~> 1.1)
12+
journey (~> 1.0.4)
13+
rack (~> 1.4.5)
14+
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
16-
sprockets (~> 2.1.2)
17-
activemodel (3.2.1)
18-
activesupport (= 3.2.1)
16+
sprockets (~> 2.2.1)
17+
activemodel (3.2.17)
18+
activesupport (= 3.2.17)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.1)
21-
activemodel (= 3.2.1)
22-
activesupport (= 3.2.1)
23-
arel (~> 3.0.0)
20+
activerecord (3.2.17)
21+
activemodel (= 3.2.17)
22+
activesupport (= 3.2.17)
23+
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.1)
26-
activemodel (= 3.2.1)
27-
activesupport (= 3.2.1)
28-
activesupport (3.2.1)
29-
i18n (~> 0.6)
25+
activeresource (3.2.17)
26+
activemodel (= 3.2.17)
27+
activesupport (= 3.2.17)
28+
activesupport (3.2.17)
29+
i18n (~> 0.6, >= 0.6.4)
3030
multi_json (~> 1.0)
31-
arel (3.0.0)
32-
builder (3.0.0)
31+
arel (3.0.3)
32+
builder (3.0.4)
33+
concurrent-ruby (1.1.5)
3334
diff-lcs (1.1.3)
3435
erubis (2.7.0)
3536
hike (1.2.3)
36-
i18n (0.6.0)
37-
journey (1.0.1)
38-
json (1.6.5)
39-
mail (2.4.1)
40-
i18n (>= 0.4.0)
37+
i18n (0.9.5)
38+
concurrent-ruby (~> 1.0)
39+
journey (1.0.4)
40+
json (1.8.6)
41+
mail (2.5.5)
4142
mime-types (~> 1.16)
4243
treetop (~> 1.4.8)
43-
mime-types (1.17.2)
44-
multi_json (1.0.4)
45-
polyglot (0.3.3)
44+
mime-types (1.25.1)
45+
multi_json (1.14.1)
46+
polyglot (0.3.5)
4647
rack (1.4.7)
47-
rack-cache (1.1)
48+
rack-cache (1.9.0)
4849
rack (>= 0.4)
49-
rack-ssl (1.3.2)
50+
rack-ssl (1.3.4)
5051
rack
51-
rack-test (0.6.1)
52+
rack-test (0.6.3)
5253
rack (>= 1.0)
53-
rails (3.2.1)
54-
actionmailer (= 3.2.1)
55-
actionpack (= 3.2.1)
56-
activerecord (= 3.2.1)
57-
activeresource (= 3.2.1)
58-
activesupport (= 3.2.1)
54+
rails (3.2.17)
55+
actionmailer (= 3.2.17)
56+
actionpack (= 3.2.17)
57+
activerecord (= 3.2.17)
58+
activeresource (= 3.2.17)
59+
activesupport (= 3.2.17)
5960
bundler (~> 1.0)
60-
railties (= 3.2.1)
61-
railties (3.2.1)
62-
actionpack (= 3.2.1)
63-
activesupport (= 3.2.1)
61+
railties (= 3.2.17)
62+
railties (3.2.17)
63+
actionpack (= 3.2.17)
64+
activesupport (= 3.2.17)
6465
rack-ssl (~> 1.3.2)
6566
rake (>= 0.8.7)
6667
rdoc (~> 3.4)
67-
thor (~> 0.14.6)
68-
rake (0.9.2.2)
69-
rdoc (3.12)
68+
thor (>= 0.14.6, < 2.0)
69+
rake (13.0.0)
70+
rdoc (3.12.2)
7071
json (~> 1.4)
7172
rspec (2.8.0)
7273
rspec-core (~> 2.8.0)
@@ -76,20 +77,21 @@ GEM
7677
rspec-expectations (2.8.0)
7778
diff-lcs (~> 1.1.2)
7879
rspec-mocks (2.8.0)
79-
sprockets (2.1.4)
80+
sprockets (2.2.3)
8081
hike (~> 1.2)
82+
multi_json (~> 1.0)
8183
rack (~> 1.0)
8284
tilt (~> 1.1, != 1.3.0)
83-
thor (0.14.6)
85+
thor (0.20.3)
8486
tilt (1.4.1)
85-
treetop (1.4.10)
87+
treetop (1.4.15)
8688
polyglot
8789
polyglot (>= 0.3.1)
88-
tzinfo (0.3.31)
90+
tzinfo (0.3.55)
8991

9092
PLATFORMS
9193
ruby
9294

9395
DEPENDENCIES
94-
rails (= 3.2.1)
96+
rails (= 3.2.17)
9597
rspec (>= 2.8.0)

0 commit comments

Comments
 (0)