Merge pull request huginn#2065 from dsander/upgrade-mysql2gem

Upgrade mysql2 gem to 0.4.8
mchung · Jul 21, 2017 · e9f025d · e9f025d
2 parents f1aafba + a29cfc8
commit e9f025d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -198,7 +198,7 @@ if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do
 end
 
 if_true(ENV['DATABASE_ADAPTER'].strip == 'mysql2') do
-  gem 'mysql2', '~> 0.3.20'
+  gem 'mysql2', ">= 0.3.18", "< 0.5"
 end
 
 GemfileHelper.parse_each_agent_gem(ENV['ADDITIONAL_GEMS']) do |args|

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.20)
+    mysql2 (0.4.8)
     naught (1.1.0)
     nenv (0.2.0)
     net-ftp-list (3.2.8)
@@ -673,7 +673,7 @@ DEPENDENCIES
   mini_magick
   mqtt
   multi_xml
-  mysql2 (~> 0.3.20)
+  mysql2 (>= 0.3.18, < 0.5)
   net-ftp-list (~> 3.2.8)
   nokogiri
   omniauth (~> 1.3.1)