Merge branch 'master' into test/upgrade-to-mongodb-30

app.rb

@@ -88,8 +88,8 @@ require 'yajl/json_gem'
 # Note that BSON was moved from Moped::BSON::ObjectId to BSON::ObjectId
 module BSON
   class ObjectId
-    def to_json
-      self.to_s.to_json
+    def as_json(options = {})
+      self.to_s
     end
   end
 end
@@ -100,8 +100,8 @@ class Time
   # object.
   # Note that this was done to prevent milliseconds from showing up in the JSON response thus breaking
   # API compatibility for downstream clients.
-  def to_json(*)
-    '"' + utc().strftime("%Y-%m-%dT%H:%M:%SZ") + '"'
+  def as_json(options = {})
+    utc().strftime("%Y-%m-%dT%H:%M:%SZ")
   end
 end
 

config.ru

@@ -10,6 +10,8 @@
 # More conversation at https://github.com/edx/cs_comments_service/pull/146
 # -Nov 18th, 2015
 
+puts "Loading config.ru."
+
 require "rack-timeout"
 use Rack::Timeout           # Call as early as possible so rack-timeout runs before other middleware.
 Rack::Timeout.timeout = 20