commit database.yml, settings.yml

.gitignore

@@ -17,17 +17,12 @@
 /log/*.log
 /log/*.log
 /tmp
 /tmp
 
 
-
 /coverage/.*
 /coverage/.*
 
 
 *.bk
 *.bk
 
 
 /db/*.sql
 /db/*.sql
 
 
-# secret files
-/config/database.yml
-/config/settings.yml
-
 /backup
 /backup
 /script/backup.sh
 /script/backup.sh
 
 

.travis.yml

@@ -20,8 +20,6 @@ before_install:
 - sh ./script/travis/bundle_install.sh
 - sh ./script/travis/bundle_install.sh
 before_script:
 before_script:
 - mysql -e 'CREATE DATABASE rendezvous_test;'
 - mysql -e 'CREATE DATABASE rendezvous_test;'
-- cp config/database.yml.example config/database.yml
-- cp config/settings.yml.example config/settings.yml
 after_script:
 after_script:
 - ruby script/travis/bundle_cache.rb
 - ruby script/travis/bundle_cache.rb
 script: bundle exec rake db:create db:test:load spec teaspoon
 script: bundle exec rake db:create db:test:load spec teaspoon