Raphael
|
f5c10bb24c
|
Put master deploy info back in master
|
2010-09-17 14:39:15 -07:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
Raphael
|
7c02200a67
|
Finish moving out websocket server, add task to start it
|
2010-09-16 21:42:16 -07:00 |
|
Raphael
|
c67a8ea100
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
|
2010-09-15 22:37:05 -07:00 |
|
Stephen Caudill
|
5595dc5f48
|
Retab the project
|
2010-09-16 13:16:10 +08:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
de93fd2818
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 18:10:13 -07:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
1006e8a680
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 11:01:11 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Raphael
|
d63cc358c5
|
Remerging master and production
|
2010-09-15 09:48:06 -07:00 |
|
Raphael
|
6dff249c73
|
Check for the presence of a password in the deploy config
|
2010-09-15 09:43:59 -07:00 |
|
Raphael
|
a9b587ca06
|
Adding in deploy config for production
|
2010-09-14 22:31:57 -07:00 |
|
Raphael
|
1d94039684
|
put in deploy configs
|
2010-09-14 22:28:13 -07:00 |
|