From 12ea460064c7ca569d2ca6163bdc5c57769d9c71 Mon Sep 17 00:00:00 2001
From: Greg Brockman <gdb@gregbrockman.com>
Date: Sat, 27 Feb 2016 19:01:04 -0800
Subject: [PATCH] Bump Mongo for compatibility with more modern servers

---
 Gemfile      |  2 ++
 Gemfile.lock | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 701596e..83c4770 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,8 @@ gem 'rack_csrf'
 gem 'erubis'
 gem 'sinatra'
 gem 'mongo_mapper'
+# Needed for MongoLab which requires SCRAM-SHA-1
+gem 'mongo', '~> 1.12'
 gem 'bson_ext'
 gem 'einhorn'
 gem 'chalk-log'
diff --git a/Gemfile.lock b/Gemfile.lock
index a5c950e..309fc68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,9 +23,9 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    bson (1.11.1)
-    bson_ext (1.11.1)
-      bson (~> 1.11.1)
+    bson (1.12.5)
+    bson_ext (1.12.5)
+      bson (~> 1.12.5)
     builder (3.2.2)
     chalk-config (0.2.1)
       configatron (~> 4.4)
@@ -74,8 +74,8 @@ GEM
     minitest (5.4.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongo (1.11.1)
-      bson (= 1.11.1)
+    mongo (1.12.5)
+      bson (= 1.12.5)
     mongo_mapper (0.13.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0)
@@ -137,6 +137,7 @@ DEPENDENCIES
   google-api-client
   mail
   mocha
+  mongo (~> 1.12)
   mongo_mapper
   pry
   puma
@@ -147,3 +148,6 @@ DEPENDENCIES
   sinatra
   symmetric-encryption
   thread
+
+BUNDLED WITH
+   1.11.2