G
This commit is contained in:
2
Gemfile
2
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'
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user