From 2fb7797c128644f8f91176df7408536192295789 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Sat, 25 May 2013 20:31:15 +0200 Subject: [PATCH] readds mysql --- Gemfile | 4 ++-- Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 04364bee..758b4167 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,8 @@ end gem 'jquery-rails' -gem 'sqlite3' -# gem 'mysql2' + +gem 'mysql2' gem 'prawn' gem 'haml-rails' gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 6911900d..2eee63eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,6 +139,7 @@ GEM mime-types (1.21) mono_logger (1.1.0) multi_json (1.7.3) + mysql2 (0.3.11) net-scp (1.1.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -279,6 +280,7 @@ DEPENDENCIES kaminari localize_input! meta_search + mysql2 prawn quiet_assets rails (~> 3.2.9)