diff --git a/Gemfile b/Gemfile index 8bfd07e1..07af7744 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "http://rubygems.org" gemspec -gem 'rails' +gem 'rails', '3.2.3' gem 'sqlite3' gem 'mysql' gem 'activerecord-import' diff --git a/Gemfile.lock b/Gemfile.lock index bab42b94..4b0701f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,34 +7,34 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.3) + actionpack (= 3.2.3) + mail (~> 2.4.4) + actionpack (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + activemodel (3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-import (0.2.9) activerecord (~> 3.0) activerecord (~> 3.0) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + activesupport (3.2.3) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -53,7 +53,7 @@ GEM hike (1.2.1) i18n (0.6.0) journey (1.0.3) - json (1.6.5) + json (1.7.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -65,7 +65,7 @@ GEM activemodel (~> 3.1) mongo (~> 1.3) tzinfo (~> 0.3.22) - multi_json (1.1.0) + multi_json (1.3.4) mysql (2.8.1) perftools.rb (2.0.0) polyglot (0.3.3) @@ -76,17 +76,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.3) + actionmailer (= 3.2.3) + actionpack (= 3.2.3) + activerecord (= 3.2.3) + activeresource (= 3.2.3) + activesupport (= 3.2.3) bundler (~> 1.0) - railties (= 3.2.2) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (= 3.2.3) + railties (3.2.3) + actionpack (= 3.2.3) + activesupport (= 3.2.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -102,7 +102,7 @@ GEM rspec-expectations (2.9.0) diff-lcs (~> 1.1.3) rspec-mocks (2.9.0) - sprockets (2.1.2) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -112,7 +112,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.33) uniform_notifier (1.0.2) PLATFORMS @@ -127,6 +127,6 @@ DEPENDENCIES mongoid mysql perftools.rb - rails + rails (= 3.2.3) rspec sqlite3