Skip to content
This repository was archived by the owner on Jan 8, 2018. It is now read-only.

Commit b506913

Browse files
committed
Update rails (CVE-2014-0130)
1 parent 66e89c4 commit b506913

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '3.2.17'
3+
gem 'rails', '3.2.18'
44

55
# Bundle edge Rails instead:
66
# gem 'rails', :git => 'git://github.com/rails/rails.git'

Gemfile.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,31 @@ GIT
3434
GEM
3535
remote: https://rubygems.org/
3636
specs:
37-
actionmailer (3.2.17)
38-
actionpack (= 3.2.17)
37+
actionmailer (3.2.18)
38+
actionpack (= 3.2.18)
3939
mail (~> 2.5.4)
40-
actionpack (3.2.17)
41-
activemodel (= 3.2.17)
42-
activesupport (= 3.2.17)
40+
actionpack (3.2.18)
41+
activemodel (= 3.2.18)
42+
activesupport (= 3.2.18)
4343
builder (~> 3.0.0)
4444
erubis (~> 2.7.0)
4545
journey (~> 1.0.4)
4646
rack (~> 1.4.5)
4747
rack-cache (~> 1.2)
4848
rack-test (~> 0.6.1)
4949
sprockets (~> 2.2.1)
50-
activemodel (3.2.17)
51-
activesupport (= 3.2.17)
50+
activemodel (3.2.18)
51+
activesupport (= 3.2.18)
5252
builder (~> 3.0.0)
53-
activerecord (3.2.17)
54-
activemodel (= 3.2.17)
55-
activesupport (= 3.2.17)
53+
activerecord (3.2.18)
54+
activemodel (= 3.2.18)
55+
activesupport (= 3.2.18)
5656
arel (~> 3.0.2)
5757
tzinfo (~> 0.3.29)
58-
activeresource (3.2.17)
59-
activemodel (= 3.2.17)
60-
activesupport (= 3.2.17)
61-
activesupport (3.2.17)
58+
activeresource (3.2.18)
59+
activemodel (= 3.2.18)
60+
activesupport (= 3.2.18)
61+
activesupport (3.2.18)
6262
i18n (~> 0.6, >= 0.6.4)
6363
multi_json (~> 1.0)
6464
acts_as_paranoid (0.4.1)
@@ -206,7 +206,7 @@ GEM
206206
method_source (0.8.2)
207207
mime-types (1.25.1)
208208
mini_portile (0.5.1)
209-
multi_json (1.8.4)
209+
multi_json (1.10.0)
210210
multi_xml (0.5.5)
211211
mysql2 (0.3.11)
212212
net-ldap (0.2.2)
@@ -253,28 +253,28 @@ GEM
253253
rack
254254
rack-mount (0.8.3)
255255
rack (>= 1.0.0)
256-
rack-ssl (1.3.3)
256+
rack-ssl (1.3.4)
257257
rack
258258
rack-test (0.6.2)
259259
rack (>= 1.0)
260-
rails (3.2.17)
261-
actionmailer (= 3.2.17)
262-
actionpack (= 3.2.17)
263-
activerecord (= 3.2.17)
264-
activeresource (= 3.2.17)
265-
activesupport (= 3.2.17)
260+
rails (3.2.18)
261+
actionmailer (= 3.2.18)
262+
actionpack (= 3.2.18)
263+
activerecord (= 3.2.18)
264+
activeresource (= 3.2.18)
265+
activesupport (= 3.2.18)
266266
bundler (~> 1.0)
267-
railties (= 3.2.17)
267+
railties (= 3.2.18)
268268
rails-i18n (0.7.3)
269269
i18n (~> 0.5)
270-
railties (3.2.17)
271-
actionpack (= 3.2.17)
272-
activesupport (= 3.2.17)
270+
railties (3.2.18)
271+
actionpack (= 3.2.18)
272+
activesupport (= 3.2.18)
273273
rack-ssl (~> 1.3.2)
274274
rake (>= 0.8.7)
275275
rdoc (~> 3.4)
276276
thor (>= 0.14.6, < 2.0)
277-
rake (10.1.1)
277+
rake (10.3.1)
278278
rb-fsevent (0.9.3)
279279
rb-inotify (0.9.1)
280280
ffi (>= 0.5.0)
@@ -349,14 +349,14 @@ GEM
349349
daemons (>= 1.0.9)
350350
eventmachine (>= 1.0.0)
351351
rack (>= 1.0.0)
352-
thor (0.18.1)
352+
thor (0.19.1)
353353
tilt (1.3.7)
354354
timecop (0.6.1)
355355
timeliness (0.3.7)
356356
treetop (1.4.15)
357357
polyglot
358358
polyglot (>= 0.3.1)
359-
tzinfo (0.3.38)
359+
tzinfo (0.3.39)
360360
uglifier (1.3.0)
361361
execjs (>= 0.3.0)
362362
multi_json (~> 1.0, >= 1.0.2)
@@ -420,7 +420,7 @@ DEPENDENCIES
420420
parallel_tests
421421
pg
422422
rack-cors
423-
rails (= 3.2.17)
423+
rails (= 3.2.18)
424424
rails-i18n
425425
rolify
426426
rspec

0 commit comments

Comments
 (0)