Commit 029244c5bddb6b5c0c570fdd34978adcda9f4c59
1 parent
43c0f238
Exists in
master
and in
1 other branch
bump to mongoid5 beta
Showing
2 changed files
with
10 additions
and
15 deletions
Show diff stats
Gemfile
@@ -8,7 +8,7 @@ gem 'actionmailer', RAILS_VERSION | @@ -8,7 +8,7 @@ gem 'actionmailer', RAILS_VERSION | ||
8 | gem 'actionpack', RAILS_VERSION | 8 | gem 'actionpack', RAILS_VERSION |
9 | gem 'railties', RAILS_VERSION | 9 | gem 'railties', RAILS_VERSION |
10 | 10 | ||
11 | -gem 'mongoid', git: 'git@github.com:mongoid/mongoid.git' | 11 | +gem 'mongoid', '5.0.0.beta' |
12 | 12 | ||
13 | gem 'devise' | 13 | gem 'devise' |
14 | gem 'haml' | 14 | gem 'haml' |
Gemfile.lock
1 | -GIT | ||
2 | - remote: git@github.com:mongoid/mongoid.git | ||
3 | - revision: f56b96b75eef6d71102c1ef89f3600d35d277e69 | ||
4 | - specs: | ||
5 | - mongoid (5.0.0) | ||
6 | - activemodel (~> 4.0) | ||
7 | - mongo (~> 2.0) | ||
8 | - origin (~> 2.1) | ||
9 | - tzinfo (>= 0.3.37) | ||
10 | - | ||
11 | GEM | 1 | GEM |
12 | remote: https://rubygems.org/ | 2 | remote: https://rubygems.org/ |
13 | specs: | 3 | specs: |
@@ -54,8 +44,8 @@ GEM | @@ -54,8 +44,8 @@ GEM | ||
54 | rack (>= 0.9.0) | 44 | rack (>= 0.9.0) |
55 | binding_of_caller (0.7.2) | 45 | binding_of_caller (0.7.2) |
56 | debug_inspector (>= 0.0.1) | 46 | debug_inspector (>= 0.0.1) |
57 | - bson (3.1.1) | ||
58 | - bson (3.1.1-java) | 47 | + bson (3.2.0) |
48 | + bson (3.2.0-java) | ||
59 | builder (3.2.2) | 49 | builder (3.2.2) |
60 | byebug (4.0.5) | 50 | byebug (4.0.5) |
61 | columnize (= 0.9.0) | 51 | columnize (= 0.9.0) |
@@ -183,8 +173,13 @@ GEM | @@ -183,8 +173,13 @@ GEM | ||
183 | mimemagic (0.3.0) | 173 | mimemagic (0.3.0) |
184 | mini_portile (0.6.2) | 174 | mini_portile (0.6.2) |
185 | minitest (5.7.0) | 175 | minitest (5.7.0) |
186 | - mongo (2.0.5) | 176 | + mongo (2.1.0.beta) |
187 | bson (~> 3.0) | 177 | bson (~> 3.0) |
178 | + mongoid (5.0.0.beta) | ||
179 | + activemodel (~> 4.0) | ||
180 | + mongo (= 2.1.0.beta) | ||
181 | + origin (~> 2.1) | ||
182 | + tzinfo (>= 0.3.37) | ||
188 | mongoid-rspec (1.10.0) | 183 | mongoid-rspec (1.10.0) |
189 | mongoid (>= 3.0.1) | 184 | mongoid (>= 3.0.1) |
190 | rake | 185 | rake |
@@ -426,7 +421,7 @@ DEPENDENCIES | @@ -426,7 +421,7 @@ DEPENDENCIES | ||
426 | kaminari (>= 0.14.1) | 421 | kaminari (>= 0.14.1) |
427 | launchy | 422 | launchy |
428 | meta_request | 423 | meta_request |
429 | - mongoid! | 424 | + mongoid (= 5.0.0.beta) |
430 | mongoid-rspec | 425 | mongoid-rspec |
431 | omniauth-github | 426 | omniauth-github |
432 | pjax_rails | 427 | pjax_rails |