Commit graph

11053 commits

Author SHA1 Message Date
maxwell
da9bcb8bec just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly 2010-06-19 15:53:37 -07:00
maxwell
5637fa4e4c update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env 2010-06-19 15:48:50 -07:00
maxwell
1fcd758bd4 removed the mutex, added rack fiber pool. this thing screams 2010-06-19 15:07:12 -07:00
maxwell
1e0e0bce79 fixing merge with master 2010-06-19 14:57:37 -07:00
maxwell
ea7abccd72 fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh:: 2010-06-19 14:56:20 -07:00
danielvincent
df2b9d6ad4 more shuffling 2010-06-19 14:44:08 -07:00
maxwell
2f6a11f018 fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit 2010-06-19 14:42:23 -07:00
danielvincent
0c392a0cce moved nav to bottom header 2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45 shrink that header 2010-06-19 00:53:42 -07:00
maxwell
f06b645b9c typo in Friend 2010-06-19 00:50:16 -07:00
maxwell
5afb97b5f7 dashboard controller stopped resolving, but the old behavior seems to work now...nnot sure why, could have been mongoid bug... 2010-06-19 00:49:35 -07:00
maxwell
8019fc8d31 working websocket 2010-06-19 00:09:58 -07:00
ilya
739b7e551b IZ deploy from git 2010-06-19 03:08:06 -04:00
danielvincent
1223011a4f more semi-drastic changes. 2010-06-19 00:01:25 -07:00
Raphael Sofaer
807314d469 added htop to sprinkle 2010-06-18 23:54:32 -07:00
maxwell
63866a8128 playing 2010-06-18 23:47:42 -07:00
Raphael Sofaer
acfa7df1c5 Merge Capistrano into master 2010-06-18 23:41:02 -07:00
Raphael Sofaer
c3e557f47d MS RS IZ start nginx & science 2010-06-18 23:38:58 -07:00
danielvincent
de8d8d5cb5 in the shit 2010-06-18 23:32:47 -07:00
Raphael Sofaer
fbe8915250 IZ uncommented the lines for the rackspace deploy 2010-06-18 22:08:17 -07:00
Raphael Sofaer
cd1ed1d164 Hopefully final conf changes 2010-06-18 19:02:59 -07:00
Raphael Sofaer
c435ba28f9 changing configures... 2010-06-18 18:09:57 -07:00
maxwell
5286b6be69 DG MS; require XML root node; added header to XML (not yet required) 2010-06-18 18:03:13 -07:00
Raphael Sofaer
ac24a9bcef changing configures... 2010-06-18 17:58:11 -07:00
Raphael Sofaer
b9d3930c61 changing configures... 2010-06-18 17:56:12 -07:00
Raphael Sofaer
8c988be7d9 changed yml again 2010-06-18 17:49:46 -07:00
Raphael Sofaer
bc9158eaeb changed thin yml 2010-06-18 17:46:52 -07:00
Raphael Sofaer
414b18fb15 added thin to gemfile 2010-06-18 17:37:56 -07:00
Raphael Sofaer
178085b984 RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf 2010-06-18 17:33:43 -07:00
maxwell
34df8fa946 DG MS; resolved unknown types going to receive handler. only post objects are inputted 2010-06-18 16:47:34 -07:00
maxwell
c430aaff18 DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml 2010-06-18 14:35:51 -07:00
maxwell
d4bf2f539d DG MS; removed signup link and route 2010-06-18 10:48:37 -07:00
maxwell
043924b5f5 made everyting so the lastest is the first thing you see 2010-06-17 20:58:20 -07:00
Raphael Sofaer
560269ef87 cleaning up sprinkle 2010-06-17 20:52:51 -07:00
maxwell
81016729c4 fixing dans commit 2010-06-17 20:35:16 -07:00
maxwell
855fc62e01 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-17 20:34:45 -07:00
maxwell
e7835955eb fixed a bug 2010-06-17 20:33:59 -07:00
danielvincent
cbdb3ecbc7 quick fix with notify_friends. sets xml variable in post request. 2010-06-17 20:32:44 -07:00
danielvincent
1ce01be534 DG MS; fixed infinate loop 2010-06-17 20:06:44 -07:00
danielvincent
39118293eb DG MS; fixed minor webhook bug when generating xml collection. 2010-06-17 18:45:50 -07:00
danielvincent
02137b9fb9 DG MS; receive hook working. 2010-06-17 18:29:56 -07:00
Raphael Sofaer
06465ec50b IZ, RS; Capistrano now works. Sort of. 2010-06-17 18:05:47 -07:00
Raphael Sofaer
9dd72123fc deleted confusing deploy.rb 2010-06-17 16:24:02 -07:00
danielvincent
ba6d136bc7 DG MS; added specs for common module 2010-06-17 15:22:02 -07:00
danielvincent
628af0372f DG MS; completed event-queue intergration. 2010-06-17 14:29:41 -07:00
danielvincent
3371b87fff DG MS; queue works. just need to move some tests over. 2010-06-17 11:32:13 -07:00
danielvincent
4cecb522b6 DG MS; queue still working. half-way finished cleaning up code. 2010-06-17 10:36:54 -07:00
danielvincent
d91cec0881 queue works. needs cleanup. 2010-06-17 10:29:30 -07:00
Maxwell Salzberg
67535c1113 tried to git rid of error in em-http-request 2010-06-17 09:20:59 -07:00
danielvincent
43207aeb41 pending: resolving post action in queue 2010-06-16 23:12:23 -07:00