Skip to content
This repository has been archived by the owner on Nov 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #186 from mallowlabs/id/186
Browse files Browse the repository at this point in the history
Update Rails to 3.2.18
  • Loading branch information
suer committed May 11, 2014
2 parents 82c9084 + 80fa0ac commit d6fcf98
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.17'
gem 'rails', '3.2.18'

# mongoid
gem 'mongoid', '2.5.1'
Expand Down
58 changes: 29 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.17)
actionpack (= 3.2.17)
actionmailer (3.2.18)
actionpack (= 3.2.18)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
actionpack (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
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.17)
activesupport (= 3.2.17)
activemodel (3.2.18)
activesupport (= 3.2.18)
builder (~> 3.0.0)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activerecord (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
activeresource (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activesupport (3.2.18)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.4)
Expand Down Expand Up @@ -131,7 +131,7 @@ GEM
activemodel (~> 3.1)
mongo (~> 1.7)
tzinfo (~> 0.3.22)
multi_json (1.9.2)
multi_json (1.10.0)
multi_xml (0.5.1)
multipart-post (1.2.0)
newrelic_rpm (3.6.5.130)
Expand All @@ -157,28 +157,28 @@ GEM
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
rails (3.2.18)
actionmailer (= 3.2.18)
actionpack (= 3.2.18)
activerecord (= 3.2.18)
activeresource (= 3.2.18)
activesupport (= 3.2.18)
bundler (~> 1.0)
railties (= 3.2.17)
railties (= 3.2.18)
rails3-generators (0.17.4)
railties (>= 3.0.0)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
railties (3.2.18)
actionpack (= 3.2.18)
activesupport (= 3.2.18)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.1)
rake (10.3.1)
rb-fsevent (0.9.1)
rcov (0.9.11)
rdoc (3.12.2)
Expand Down Expand Up @@ -245,7 +245,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
tzinfo (0.3.39)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
Expand Down Expand Up @@ -289,7 +289,7 @@ DEPENDENCIES
on_the_spot
pusher
quiet_assets
rails (= 3.2.17)
rails (= 3.2.18)
rails3-generators
rb-fsevent
rcov
Expand Down

0 comments on commit d6fcf98

Please sign in to comment.