From 27a3fd7f03f8049667a39a746f6a539b2beb3d56 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Fri, 18 Jul 2014 18:20:28 +0200
Subject: [PATCH] =?UTF-8?q?La=20gestion=20des=20translations=20dans=20la?=
 =?UTF-8?q?=20base=20de=20donn=C3=A9es=20ne=20bloque=20plus=20une=20migrat?=
 =?UTF-8?q?ion=20initiale=20du=20site?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile             | 9 ++++++---
 config/database.yml | 9 ++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index f786fa23..18bf2dd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,9 +5,6 @@ gem 'rails', '~> 4.1.0.rc1'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.1'
 
-# Use mysql as the database for Active Record
-gem 'mysql2'
-
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier'
 
@@ -92,6 +89,7 @@ gem 'tinymce-rails-langs'
 gem 'meta-tags'
 
 group :development do
+  gem 'sqlite'
   gem 'guard-livereload'
   gem 'guard-bundler'
   gem 'guard-minitest'
@@ -101,3 +99,8 @@ group :development do
   gem 'brakeman', require: false
   gem 'guard-brakeman'
 end
+
+group :production do
+  # Use mysql as the database for Active Record
+  gem 'mysql2'
+end
diff --git a/config/database.yml b/config/database.yml
index d7063857..ba055928 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -9,14 +9,9 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql2
-  encoding: utf8
-  #database: agenda-du-libre-rails_development
-  database: adl_fr
+  adapter: sqlite3
   pool: 5
-  username: manu
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".