Permalink
Browse files

Upgrade mongo_mapper to deal with this incompatibility: mongomapper/m…

  • Loading branch information...
1 parent 8ef56a7 commit 1cf7c0a281c7684db00efb996a0259aac3cf3d53 @carols10cents carols10cents committed Aug 13, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 Gemfile
  2. +5 −5 Gemfile.lock
View
@@ -20,7 +20,7 @@ gem 'airbrake', "~> 3.0.9"
gem 'bcrypt-ruby', "~> 3.0.0"
gem 'unicorn', "~> 4.0.1"
gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git'
-gem "mongo_mapper", "~> 0.9.2"
+gem "mongo_mapper", "~> 0.11.2"
gem "mongo", "= 1.6.2"
gem "bson", "= 1.6.2"
gem "bson_ext", "= 1.6.2"
View
@@ -176,10 +176,10 @@ GEM
metaclass (~> 0.0.1)
mongo (1.6.2)
bson (~> 1.6.2)
- mongo_mapper (0.9.2)
+ mongo_mapper (0.11.2)
activemodel (~> 3.0)
activesupport (~> 3.0)
- plucky (~> 0.3.8)
+ plucky (~> 0.5.1)
multi_json (1.0.4)
multi_xml (0.2.2)
multipart-post (1.1.3)
@@ -197,8 +197,8 @@ GEM
osub (0.0.7)
ostatus
ruby-hmac
- plucky (0.3.8)
- mongo (~> 1.3)
+ plucky (0.5.1)
+ mongo (~> 1.5)
polyglot (0.3.3)
pony (1.3)
mail (> 2.0)
@@ -327,7 +327,7 @@ DEPENDENCIES
minitest (~> 2.12.1)
mocha (~> 0.11.0)
mongo (= 1.6.2)
- mongo_mapper (~> 0.9.2)
+ mongo_mapper (~> 0.11.2)
newrelic_rpm (~> 3.3.1)
nokogiri (~> 1.5.0)
omniauth!

0 comments on commit 1cf7c0a

Please sign in to comment.