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

Commit 69aef87

Browse files
committed
Rails update, refs #10188
1 parent 1154c43 commit 69aef87

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
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.14'
3+
gem 'rails', '3.2.17'
44

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

Gemfile.lock

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,39 @@ GIT
4242
GEM
4343
remote: https://rubygems.org/
4444
specs:
45-
actionmailer (3.2.14)
46-
actionpack (= 3.2.14)
45+
actionmailer (3.2.17)
46+
actionpack (= 3.2.17)
4747
mail (~> 2.5.4)
48-
actionpack (3.2.14)
49-
activemodel (= 3.2.14)
50-
activesupport (= 3.2.14)
48+
actionpack (3.2.17)
49+
activemodel (= 3.2.17)
50+
activesupport (= 3.2.17)
5151
builder (~> 3.0.0)
5252
erubis (~> 2.7.0)
5353
journey (~> 1.0.4)
5454
rack (~> 1.4.5)
5555
rack-cache (~> 1.2)
5656
rack-test (~> 0.6.1)
5757
sprockets (~> 2.2.1)
58-
activemodel (3.2.14)
59-
activesupport (= 3.2.14)
58+
activemodel (3.2.17)
59+
activesupport (= 3.2.17)
6060
builder (~> 3.0.0)
61-
activerecord (3.2.14)
62-
activemodel (= 3.2.14)
63-
activesupport (= 3.2.14)
61+
activerecord (3.2.17)
62+
activemodel (= 3.2.17)
63+
activesupport (= 3.2.17)
6464
arel (~> 3.0.2)
6565
tzinfo (~> 0.3.29)
66-
activeresource (3.2.14)
67-
activemodel (= 3.2.14)
68-
activesupport (= 3.2.14)
69-
activesupport (3.2.14)
66+
activeresource (3.2.17)
67+
activemodel (= 3.2.17)
68+
activesupport (= 3.2.17)
69+
activesupport (3.2.17)
7070
i18n (~> 0.6, >= 0.6.4)
7171
multi_json (~> 1.0)
7272
acts_as_paranoid (0.4.1)
7373
activerecord (~> 3.2)
7474
addressable (2.3.3)
7575
annotate (2.5.0)
7676
rake
77-
arel (3.0.2)
77+
arel (3.0.3)
7878
backports (3.3.3)
7979
bcrypt-ruby (3.0.1)
8080
better_errors (0.7.2)
@@ -210,7 +210,7 @@ GEM
210210
rack-contrib
211211
railties
212212
method_source (0.8.2)
213-
mime-types (1.25)
213+
mime-types (1.25.1)
214214
mini_portile (0.5.1)
215215
multi_json (1.8.4)
216216
multi_xml (0.5.5)
@@ -242,7 +242,7 @@ GEM
242242
parallel_tests (0.13.3)
243243
parallel
244244
pg (0.14.1)
245-
polyglot (0.3.3)
245+
polyglot (0.3.4)
246246
pry (0.9.12.2)
247247
coderay (~> 1.0.5)
248248
method_source (~> 0.8)
@@ -263,19 +263,19 @@ GEM
263263
rack
264264
rack-test (0.6.2)
265265
rack (>= 1.0)
266-
rails (3.2.14)
267-
actionmailer (= 3.2.14)
268-
actionpack (= 3.2.14)
269-
activerecord (= 3.2.14)
270-
activeresource (= 3.2.14)
271-
activesupport (= 3.2.14)
266+
rails (3.2.17)
267+
actionmailer (= 3.2.17)
268+
actionpack (= 3.2.17)
269+
activerecord (= 3.2.17)
270+
activeresource (= 3.2.17)
271+
activesupport (= 3.2.17)
272272
bundler (~> 1.0)
273-
railties (= 3.2.14)
273+
railties (= 3.2.17)
274274
rails-i18n (0.7.3)
275275
i18n (~> 0.5)
276-
railties (3.2.14)
277-
actionpack (= 3.2.14)
278-
activesupport (= 3.2.14)
276+
railties (3.2.17)
277+
actionpack (= 3.2.17)
278+
activesupport (= 3.2.17)
279279
rack-ssl (~> 1.3.2)
280280
rake (>= 0.8.7)
281281
rdoc (~> 3.4)
@@ -423,7 +423,7 @@ DEPENDENCIES
423423
parallel_tests
424424
pg
425425
rack-cors
426-
rails (= 3.2.14)
426+
rails (= 3.2.17)
427427
rails-i18n
428428
rolify
429429
rspec

0 commit comments

Comments
 (0)