andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

G

Browse Source
This commit is contained in:
Andreas Stephanides
2013-10-28 11:25:29 +01:00
parent 1058709b38
commit 637fe7dc9f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -4,7 +4,7 @@ gem 'rails', '3.2.9'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql2'
gem 'sqlite3' gem 'sqlite3'
gem 'execjs', '~>1.4.0' gem 'execjs', '~>1.4.0'

2
Gemfile.lock
View File

@@ -102,6 +102,7 @@ GEM
mime-types (1.21) mime-types (1.21)
multi_json (1.5.1) multi_json (1.5.1)
multipart-post (1.2.0) multipart-post (1.2.0)
mysql2 (0.3.13)
net-ldap (0.2.2) net-ldap (0.2.2)
oauth2 (0.8.1) oauth2 (0.8.1)
faraday (~> 0.8) faraday (~> 0.8)
@@ -227,6 +228,7 @@ DEPENDENCIES
haml haml
jquery-fileupload-rails jquery-fileupload-rails
jquery-rails jquery-rails
mysql2
omniauth omniauth
omniauth-facebook omniauth-facebook
omniauth-ldap omniauth-ldap

8
config/database.yml
View File

@@ -19,7 +19,11 @@ test:
timeout: 5000 timeout: 5000
production: production:
adapter: sqlite3 adapter: mysql2
database: db/production.sqlite3 encoding: utf8
database: test1production
pool: 5 pool: 5
username: root
password: changeme
socket: /var/run/mysqld/mysqld.sock
timeout: 5000 timeout: 5000