Skip to content

Commit

Permalink
Merge pull request hotsh#821 from carols10cents/rails-3.2.20
Browse files Browse the repository at this point in the history
Update to latest patch version of rails, 3.2.20
  • Loading branch information
wilkie committed Nov 7, 2014
2 parents 24b7000 + da96f73 commit 450d891
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.2.14'
gem 'rails', '3.2.20'

# Gems used only for assets and not required
# in production environments by default.
Expand Down
55 changes: 28 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ GEM
remote: http://rubygems.org/
specs:
aaronh-chronic (0.3.9)
actionmailer (3.2.14)
actionpack (= 3.2.14)
actionmailer (3.2.20)
actionpack (= 3.2.20)
mail (~> 2.5.4)
actionpack (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
actionpack (3.2.20)
activemodel (= 3.2.20)
activesupport (= 3.2.20)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.14)
activesupport (= 3.2.14)
activemodel (3.2.20)
activesupport (= 3.2.20)
builder (~> 3.0.0)
activerecord (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activerecord (3.2.20)
activemodel (= 3.2.20)
activesupport (= 3.2.20)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activesupport (3.2.14)
activeresource (3.2.20)
activemodel (= 3.2.20)
activesupport (= 3.2.20)
activesupport (3.2.20)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.6)
Expand Down Expand Up @@ -196,17 +196,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.14)
actionmailer (= 3.2.14)
actionpack (= 3.2.14)
activerecord (= 3.2.14)
activeresource (= 3.2.14)
activesupport (= 3.2.14)
rails (3.2.20)
actionmailer (= 3.2.20)
actionpack (= 3.2.20)
activerecord (= 3.2.20)
activeresource (= 3.2.20)
activesupport (= 3.2.20)
bundler (~> 1.0)
railties (= 3.2.14)
railties (3.2.14)
actionpack (= 3.2.14)
activesupport (= 3.2.14)
railties (= 3.2.20)
railties (3.2.20)
actionpack (= 3.2.20)
activesupport (= 3.2.20)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand Down Expand Up @@ -242,7 +242,7 @@ GEM
simplecov (0.4.2)
simplecov-html (~> 0.4.4)
simplecov-html (0.4.5)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -260,6 +260,7 @@ GEM
rake
rest-client (~> 1.6)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
twitter (5.11.0)
addressable (~> 2.3)
Expand All @@ -272,7 +273,7 @@ GEM
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.2.0)
tzinfo (0.3.40)
tzinfo (0.3.42)
uglifier (1.0.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
Expand Down Expand Up @@ -326,7 +327,7 @@ DEPENDENCIES
puma (~> 2.9.0)
pygmentize (~> 0.0.3)
quiet_assets (~> 1.0.0)
rails (= 3.2.14)
rails (= 3.2.20)
ratom (~> 0.8.2)
rdiscount (~> 1.6.8)
redfinger!
Expand Down

0 comments on commit 450d891

Please sign in to comment.