diff --git a/Gemfile b/Gemfile index 6cc16f9..58b29b7 100755 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.9' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' - + gem 'mysql2' gem 'sqlite3' gem 'execjs', '~>1.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index c4d9168..5024fab 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,6 +102,7 @@ GEM mime-types (1.21) multi_json (1.5.1) multipart-post (1.2.0) + mysql2 (0.3.13) net-ldap (0.2.2) oauth2 (0.8.1) faraday (~> 0.8) @@ -227,6 +228,7 @@ DEPENDENCIES haml jquery-fileupload-rails jquery-rails + mysql2 omniauth omniauth-facebook omniauth-ldap diff --git a/config/database.yml b/config/database.yml index 51a4dd4..e7882ce 100755 --- a/config/database.yml +++ b/config/database.yml @@ -19,7 +19,11 @@ test: timeout: 5000 production: - adapter: sqlite3 - database: db/production.sqlite3 + adapter: mysql2 + encoding: utf8 + database: test1production pool: 5 + username: root + password: changeme + socket: /var/run/mysqld/mysqld.sock timeout: 5000