search

agile-france / propile

Community Conference Program Compiler (for Agile France)
2 stars 8 forks source link

Set ruby version matching rbenv #14

Closed yaf closed 10 years ago

yaf commented 10 years ago

I don't know if my little change have an impact for rvm users ?

yaf commented 10 years ago

Add some change about ZenTest that not zork at home: http://stackoverflow.com/questions/14488605/cant-install-zentest-4-8-4

Add change for database.yml by adding port and host (to work with PG on my computer) No problem with heroku, they don't use this file.

Add dotenv to be abble to share a default environment file that fake env variable as in production.

remove connents in Gemfile.

oelmekki commented 10 years ago

Hello @yaf , thanks for PR.

Can you please squash your commits ?

Also, please do not commit .env in the repos, it would force all developers to use the same credentials than yours.

dboissier commented 10 years ago

Hi guys,

Github tells me there are some conflicts so it cannot automatically merge the pull request. Could you please tell me which files and/or commit I should merge into the master?

Thanks,

David

oelmekki commented 10 years ago

This is due to parallel changes in Gemfile. Please wait for @yaf to resolve conflicts, you will then be able to merge PR.

yaf commented 10 years ago

done