Merge branch 'master' into autoflagging_tests

Charcoal-SE · May 14, 2017 · cbd2e6b · cbd2e6b
2 parents 015fad7 + 1bb42a1
commit cbd2e6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'awesome_print'
 
 gem 'aescrypt', '~> 2.0', '>= 2.0.2', github: 'Charcoal-SE/aescrypt'
 gem 'devise', git: 'https://github.com/plataformatec/devise.git', branch: 'master'
-gem "mysql2"
+gem "mysql2", '0.4.5'
 gem "puma"
 gem 'will_paginate', github: "Undo1/will_paginate"
 gem 'loofah'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -175,7 +175,7 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mysql2 (0.4.6)
+    mysql2 (0.4.5)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     net-scp (1.2.1)
@@ -330,7 +330,7 @@ DEPENDENCIES
   jquery-rails
   jwt
   loofah
-  mysql2
+  mysql2 (= 0.4.5)
   octokit (~> 4.0)
   puma
   rack-cors