Commit 11173e8143c643011d3007999964cb09f3407a11
1 parent
77637057
Exists in
master
and in
1 other branch
Update mongoid to latest RC
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
Gemfile
@@ -2,8 +2,8 @@ source 'http://rubygems.org' | @@ -2,8 +2,8 @@ source 'http://rubygems.org' | ||
2 | 2 | ||
3 | gem 'rails', '3.0.3' | 3 | gem 'rails', '3.0.3' |
4 | gem 'libxml-ruby' | 4 | gem 'libxml-ruby' |
5 | -gem 'bson_ext', :require => nil | ||
6 | -gem 'mongoid', '~> 2.0.0.beta.20' | 5 | +gem 'bson_ext', '~> 1.2' |
6 | +gem 'mongoid', '~> 2.0.0.rc.6' | ||
7 | gem 'haml' | 7 | gem 'haml' |
8 | gem 'will_paginate' | 8 | gem 'will_paginate' |
9 | gem 'devise', '~> 1.1.3' | 9 | gem 'devise', '~> 1.1.3' |
Gemfile.lock
@@ -31,7 +31,7 @@ GEM | @@ -31,7 +31,7 @@ GEM | ||
31 | arel (2.0.4) | 31 | arel (2.0.4) |
32 | bcrypt-ruby (2.1.2) | 32 | bcrypt-ruby (2.1.2) |
33 | bson (1.1.2) | 33 | bson (1.1.2) |
34 | - bson_ext (1.1.2) | 34 | + bson_ext (1.2.0) |
35 | builder (2.1.2) | 35 | builder (2.1.2) |
36 | database_cleaner (0.6.0) | 36 | database_cleaner (0.6.0) |
37 | devise (1.1.3) | 37 | devise (1.1.3) |
@@ -102,13 +102,13 @@ PLATFORMS | @@ -102,13 +102,13 @@ PLATFORMS | ||
102 | ruby | 102 | ruby |
103 | 103 | ||
104 | DEPENDENCIES | 104 | DEPENDENCIES |
105 | - bson_ext | 105 | + bson_ext (~> 1.2) |
106 | database_cleaner (~> 0.6.0) | 106 | database_cleaner (~> 0.6.0) |
107 | devise (~> 1.1.3) | 107 | devise (~> 1.1.3) |
108 | factory_girl_rails | 108 | factory_girl_rails |
109 | haml | 109 | haml |
110 | libxml-ruby | 110 | libxml-ruby |
111 | - mongoid (~> 2.0.0.beta.20) | 111 | + mongoid (~> 2.0.0.rc.6) |
112 | rails (= 3.0.3) | 112 | rails (= 3.0.3) |
113 | rspec (~> 2.1) | 113 | rspec (~> 2.1) |
114 | rspec-rails (~> 2.1) | 114 | rspec-rails (~> 2.1) |