From ce9c3c216287df6fe194845eaed34dcc7ef25780 Mon Sep 17 00:00:00 2001
From: Jim Fowler <fowler@math.ohio-state.edu>
Date: Mon, 8 Feb 2016 09:58:21 -0500
Subject: [PATCH] Bandaids

---
 Gemfile      |  4 ++--
 Gemfile.lock | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index c34db9d..6d56982 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rails'
 
 gem 'sqlite3', :group => [:test, :development]
-gem 'mysql2',  :group => [:production, :staging]
+# gem 'mysql2',  :group => [:production, :staging]
 #gem 'mongoid'
 
 gem 'jquery-rails'
@@ -27,7 +27,7 @@ gem 'omniauth-google-oauth2'
 gem 'nokogiri'
 
 group :development do
-  gem 'capistrano', '~> 2.15.5'
+  gem 'capistrano', '~> 2.14.1'
   gem 'rvm-capistrano'
   gem 'thin'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 7098a74..f591a40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,6 +22,7 @@ GEM
       activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    libv8 (3.11.8.12)
     activeresource (3.2.12)
       activemodel (= 3.2.12)
       activesupport (= 3.2.12)
@@ -82,7 +83,6 @@ GEM
     less-rails (2.2.6)
       actionpack (>= 3.1)
       less (~> 2.2.0)
-    libv8 (3.11.8.12)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -92,7 +92,6 @@ GEM
     mime-types (1.21)
     multi_json (1.6.0)
     multipart-post (1.1.5)
-    mysql2 (0.3.11)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.1)
@@ -100,7 +99,6 @@ GEM
     net-ssh (2.6.5)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.5.6)
     oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
@@ -113,12 +111,21 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
+    ref (1.0.2)
+    therubyracer (0.11.3)
+      ref
     omniauth (1.1.1)
       hashie (~> 1.2)
       rack
+    omniauth-google-oauth2 (0.2.6)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
+      omniauth (~> 1.0)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
@@ -153,10 +160,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    nokogiri (1.5.6)
     rake (10.0.3)
     rdoc (3.12.1)
       json (~> 1.4)
-    ref (1.0.2)
     ruby-openid (2.2.3)
     rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
@@ -171,8 +178,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    therubyracer (0.11.3)
-      ref
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -203,30 +208,33 @@ PLATFORMS
 
 DEPENDENCIES
   ambry
-  capistrano
+  capistrano (~> 2.14.1)
   coffee-rails (~> 3.2.1)
   devise
+  nokogiri
   factory_girl_rails
   gravatar_image_tag
   jquery-rails
   json
   less-rails
-  libv8
   merit
-  mysql2
-  nokogiri
   oauth-plugin (~> 0.4.0)
   omniauth
+  omniauth-google-oauth2
   omniauth-oauth
   omniauth-openid
+  libv8
+  therubyracer
   piwik_analytics (~> 1.0.1)
   rails
   rvm-capistrano
   sass-rails (~> 3.2.3)
   sqlite3
-  therubyracer
   thin
   tokenifier (~> 0.1)
   turbo-sprockets-rails3
   twitter-bootstrap-rails
   uglifier (>= 1.0.3)
+
+BUNDLED WITH
+   1.10.6