diff --git a/Gemfile b/Gemfile index 574e52e..82ece70 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,5 @@ gem "activemodel", "3.1.0" # group :test do gem "rspec" - gem "activerecord", "3.1.0" + gem "activerecord", "3.2.14" # end diff --git a/Gemfile.lock b/Gemfile.lock index 14a1302..e6cbdca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,19 +6,16 @@ GEM bcrypt-ruby (~> 3.0.0) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) + activerecord (3.2.14) activesupport (3.1.0) multi_json (~> 1.0) - arel (2.2.3) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) + concurrent-ruby (1.1.10) diff-lcs (1.1.3) - i18n (0.6.0) - multi_json (1.3.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + multi_json (1.15.0) rake (0.8.7) rspec (2.9.0) rspec-core (~> 2.9.0) @@ -28,14 +25,13 @@ GEM rspec-expectations (2.9.1) diff-lcs (~> 1.1.3) rspec-mocks (2.9.0) - tzinfo (0.3.33) PLATFORMS ruby DEPENDENCIES activemodel (= 3.1.0) - activerecord (= 3.1.0) + activerecord (= 3.2.14) activesupport (= 3.1.0) rake rspec