oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
Conflicts:
	Pearlception/config/routes.rb
This commit is contained in:
Okechi Onyeje 2017-01-10 16:52:37 -05:00
commit ae1db56380
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Pearlception/config/database.yml
View File

@ -13,9 +13,9 @@ default: &default
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
pool: 5 pool: 5
username: root username: <%= ENV['TEST_USER'] %>
password: terps password: <%= ENV['TEST_PASS'] %>
socket: /var/run/mysqld/mysqld.sock socket: <%= ENV['TEST_SOCKET'] %>
stats_development: &stats stats_development: &stats
adapter: mysql2 adapter: mysql2