La gestion des translations dans la base de données ne bloque plus une migration initiale du site

This commit is contained in:
echarp 2014-07-18 18:20:28 +02:00
parent ce152dc300
commit 27a3fd7f03
2 changed files with 8 additions and 10 deletions

View File

@ -5,9 +5,6 @@ gem 'rails', '~> 4.1.0.rc1'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.1' gem 'sass-rails', '~> 4.0.1'
# Use mysql as the database for Active Record
gem 'mysql2'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier' gem 'uglifier'
@ -92,6 +89,7 @@ gem 'tinymce-rails-langs'
gem 'meta-tags' gem 'meta-tags'
group :development do group :development do
gem 'sqlite'
gem 'guard-livereload' gem 'guard-livereload'
gem 'guard-bundler' gem 'guard-bundler'
gem 'guard-minitest' gem 'guard-minitest'
@ -101,3 +99,8 @@ group :development do
gem 'brakeman', require: false gem 'brakeman', require: false
gem 'guard-brakeman' gem 'guard-brakeman'
end end
group :production do
# Use mysql as the database for Active Record
gem 'mysql2'
end

View File

@ -9,14 +9,9 @@
# And be sure to use new-style password hashing: # And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html # http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development: development:
adapter: mysql2 adapter: sqlite3
encoding: utf8
#database: agenda-du-libre-rails_development
database: adl_fr
pool: 5 pool: 5
username: manu timeout: 5000
password:
socket: /var/run/mysqld/mysqld.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".