From e25dd94d637168d6a8f35bfcdb190b36d40e31ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Wed, 14 Sep 2011 11:25:20 +0200 Subject: [PATCH] Fixes issue #1395 (utf8 and ruby 1.9.2) --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9a77f1c58..80c1f53b3 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'settingslogic', '2.0.6' gem 'activerecord-import' gem 'foreigner', '0.9.1' -gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.2.13' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' diff --git a/Gemfile.lock b/Gemfile.lock index 64d5104f5..5428faa43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM multi_json (1.0.3) multi_xml (0.2.2) multipart-post (1.1.3) - mysql2 (0.2.6) + mysql2 (0.2.13) net-ldap (0.2.2) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -505,7 +505,7 @@ DEPENDENCIES mini_magick (= 3.2) mobile-fu mongrel - mysql2 (= 0.2.6) + mysql2 (= 0.2.13) newrelic_rpm nokogiri oauth2-provider (= 0.0.16)