Download as
Browse Code »

Commit 285ab4d66374158bcd67f6fee21388f313f5f543

Authored by Stephen Crosby
2 parents 96efc4d7 9930285f
Exists in master

Merge pull request #1030 from svoop/update_mongoid 

Update mongoid gem to 5.0.2
Showing 2 changed files with 11 additions and 8 deletions   Show diff stats
@@ -27,7 +27,7 @@ gem 'font-awesome-rails' @@ -27,7 +27,7 @@ gem 'font-awesome-rails'
27 gem 'haml' 27 gem 'haml'
28 gem 'htmlentities' 28 gem 'htmlentities'
29 gem 'kaminari', '>= 0.14.1' 29 gem 'kaminari', '>= 0.14.1'
30 -gem 'mongoid', '5.0.0' 30 +gem 'mongoid', '5.0.2'
31 gem 'mongoid_rails_migrations' 31 gem 'mongoid_rails_migrations'
32 gem 'rack-ssl', require: 'rack/ssl' # force SSL 32 gem 'rack-ssl', require: 'rack/ssl' # force SSL
33 gem 'rack-ssl-enforcer', require: false 33 gem 'rack-ssl-enforcer', require: false
@@ -56,8 +56,8 @@ GEM @@ -56,8 +56,8 @@ GEM
56 rack (>= 0.9.0) 56 rack (>= 0.9.0)
57 binding_of_caller (0.7.2) 57 binding_of_caller (0.7.2)
58 debug_inspector (>= 0.0.1) 58 debug_inspector (>= 0.0.1)
59 - bson (3.2.4)  
60 - bson (3.2.4-java) 59 + bson (4.0.0)
  60 + bson (4.0.0-java)
61 builder (3.2.2) 61 builder (3.2.2)
62 byebug (4.0.5) 62 byebug (4.0.5)
63 columnize (= 0.9.0) 63 columnize (= 0.9.0)
@@ -184,10 +184,10 @@ GEM @@ -184,10 +184,10 @@ GEM
184 mime-types (2.6.1) 184 mime-types (2.6.1)
185 mimemagic (0.3.0) 185 mimemagic (0.3.0)
186 mini_portile2 (2.0.0) 186 mini_portile2 (2.0.0)
187 - minitest (5.8.1)  
188 - mongo (2.1.1)  
189 - bson (~> 3.0)  
190 - mongoid (5.0.0) 187 + minitest (5.8.3)
  188 + mongo (2.2.1)
  189 + bson (~> 4.0)
  190 + mongoid (5.0.2)
191 activemodel (~> 4.0) 191 activemodel (~> 4.0)
192 mongo (~> 2.1) 192 mongo (~> 2.1)
193 origin (~> 2.1) 193 origin (~> 2.1)
@@ -457,7 +457,7 @@ DEPENDENCIES @@ -457,7 +457,7 @@ DEPENDENCIES
457 kaminari (>= 0.14.1) 457 kaminari (>= 0.14.1)
458 launchy 458 launchy
459 meta_request 459 meta_request
460 - mongoid (= 5.0.0) 460 + mongoid (= 5.0.2)
461 mongoid-rspec (~> 3.0.0) 461 mongoid-rspec (~> 3.0.0)
462 mongoid_rails_migrations 462 mongoid_rails_migrations
463 omniauth-github 463 omniauth-github
@@ -488,3 +488,6 @@ DEPENDENCIES @@ -488,3 +488,6 @@ DEPENDENCIES
488 useragent 488 useragent
489 xmpp4r 489 xmpp4r
490 yajl-ruby 490 yajl-ruby
  491 +
  492 +BUNDLED WITH
  493 + 1.11.2