Merge pull request #154 from edx/e0d/update-nokogiri

E0d/update nokogiri

Gemfile

@@ -30,7 +30,7 @@ gem 'mongoid_magic_counter_cache'
 gem 'faker'
 gem 'will_paginate_mongoid', "~>2.0"
 gem 'rdiscount'
-gem 'nokogiri'
+gem 'nokogiri', "~>1.6.7.1"
 
 gem 'tire', "0.6.2"
 gem 'tire-contrib'
@@ -45,9 +45,7 @@ group :test do
   gem 'guard'
   gem 'guard-unicorn'
   gem 'codecov', :require => false
-  # database_cleaner 1.5.1 which is compatible with Mongoid 5 has not been released
-  # to rubygems yet, so pull it from github.
-  gem 'database_cleaner', :git =>  'https://github.com/DatabaseCleaner/database_cleaner', :ref => 'b87f00320f8aa0f7e499d183128f05ce29cedc33'
+  gem 'database_cleaner', "~>1.5.1" 
 end
 
 gem 'newrelic_rpm'

Gemfile.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/DatabaseCleaner/database_cleaner
-  revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
-  ref: b87f00320f8aa0f7e499d183128f05ce29cedc33
-  specs:
-    database_cleaner (1.5.1)
-
 GIT
   remote: https://github.com/macdiesel/mongoid-tree
   revision: b381dd56f1b3b061df8f4b4181d5440dea1602d1
@@ -49,6 +42,7 @@ GEM
       url
     coderay (1.0.7)
     dalli (2.1.0)
+    database_cleaner (1.5.1)
     delayed_job (4.1.1)
       activesupport (>= 3.0, < 5.0)
     delayed_job_mongoid (2.2.0)
@@ -77,6 +71,7 @@ GEM
     listen (0.5.0)
     method_source (0.8)
     mime-types (2.6.1)
+    mini_portile2 (2.0.0)
     minitest (5.8.1)
     mongo (2.1.1)
       bson (~> 3.0)
@@ -94,7 +89,8 @@ GEM
     multi_json (1.11.2)
     netrc (0.10.3)
     newrelic_rpm (3.13.2.302)
-    nokogiri (1.5.5)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     origin (2.1.1)
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
@@ -173,7 +169,7 @@ DEPENDENCIES
   bundler
   codecov
   dalli
-  database_cleaner!
+  database_cleaner (~> 1.5.1)
   delayed_job
   delayed_job_mongoid
   enumerize
@@ -185,7 +181,7 @@ DEPENDENCIES
   mongoid-tree!
   mongoid_magic_counter_cache
   newrelic_rpm
-  nokogiri
+  nokogiri (~> 1.6.7.1)
   protected_attributes
   pry
   pry-nav