Skip to content

Commit

Permalink
Upgrading (and deliberately locking) mongo, bson, and bson_ext
Browse files Browse the repository at this point in the history
  • Loading branch information
carols10cents committed Aug 12, 2012
1 parent efe46de commit 37173bf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ gem 'bcrypt-ruby', "~> 3.0.0"
gem 'unicorn', "~> 4.0.1" gem 'unicorn', "~> 4.0.1"
gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git' gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git'
gem "mongo_mapper", "~> 0.9.2" gem "mongo_mapper", "~> 0.9.2"
gem "bson_ext", "~> 1.3.1" gem "mongo", "= 1.6.2"
gem "bson", "= 1.6.2"
gem "bson_ext", "= 1.6.2"
gem "i18n", "~> 0.6.0" gem "i18n", "~> 0.6.0"
gem "twitter", "~> 1.6.2" gem "twitter", "~> 1.6.2"
gem "pony", "~> 1.3" gem "pony", "~> 1.3"
Expand Down
13 changes: 8 additions & 5 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ GEM
builder builder
arel (2.2.3) arel (2.2.3)
bcrypt-ruby (3.0.0) bcrypt-ruby (3.0.0)
bson (1.3.1) bson (1.6.2)
bson_ext (1.3.1) bson_ext (1.6.2)
bson (~> 1.6.2)
builder (3.0.0) builder (3.0.0)
capybara (1.1.2) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
Expand Down Expand Up @@ -173,8 +174,8 @@ GEM
minitest (2.12.1) minitest (2.12.1)
mocha (0.11.1) mocha (0.11.1)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mongo (1.3.1) mongo (1.6.2)
bson (>= 1.3.1) bson (~> 1.6.2)
mongo_mapper (0.9.2) mongo_mapper (0.9.2)
activemodel (~> 3.0) activemodel (~> 3.0)
activesupport (~> 3.0) activesupport (~> 3.0)
Expand Down Expand Up @@ -311,7 +312,8 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
airbrake (~> 3.0.9) airbrake (~> 3.0.9)
bcrypt-ruby (~> 3.0.0) bcrypt-ruby (~> 3.0.0)
bson_ext (~> 1.3.1) bson (= 1.6.2)
bson_ext (= 1.6.2)
capybara (~> 1.1.2) capybara (~> 1.1.2)
coffee-rails (~> 3.1.0) coffee-rails (~> 3.1.0)
compass-rails (~> 1.0.3) compass-rails (~> 1.0.3)
Expand All @@ -327,6 +329,7 @@ DEPENDENCIES
launchy (~> 2.0.5) launchy (~> 2.0.5)
minitest (~> 2.12.1) minitest (~> 2.12.1)
mocha (~> 0.11.0) mocha (~> 0.11.0)
mongo (= 1.6.2)
mongo_mapper (~> 0.9.2) mongo_mapper (~> 0.9.2)
newrelic_rpm (~> 3.3.1) newrelic_rpm (~> 3.3.1)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
Expand Down

0 comments on commit 37173bf

Please sign in to comment.