Commit graph

5582 commits

Author SHA1 Message Date
maxwell
72e10cfad6 remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times 2011-01-18 22:45:43 -08:00
maxwell
02ab24335a remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times 2011-01-18 22:39:14 -08:00
maxwell
85b824babc Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 22:12:11 -08:00
maxwell
7a02a31440 fix invitations#new, and a post spec which was mongo specific 2011-01-18 22:11:58 -08:00
Raphael
3935d978ac Take some queries out of views 2011-01-18 19:11:01 -08:00
zhitomirskiyi
960058803a Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 17:23:03 -08:00
zhitomirskiyi
21bccedf9b notification eagerly load the target 2011-01-18 17:22:48 -08:00
danielvincent
4f25dfa6d3 publics controller merge fix 2011-01-18 17:14:32 -08:00
zhitomirskiyi
5ac194911f Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 17:07:03 -08:00
zhitomirskiyi
e7a4c47f0a include target for notification 2011-01-18 17:06:54 -08:00
danielvincent
849a5476ab Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 17:06:15 -08:00
danielvincent
3dd2384458 Merge branch 'fixturebuilder'
Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb
2011-01-18 17:05:44 -08:00
Raphael
38dd58315d typo 2011-01-18 17:04:22 -08:00
danielvincent
1fa39ad20d fixed issue in attack_vectors_spec 2011-01-18 16:58:59 -08:00
zhitomirskiyi
38a3193a61 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:58:04 -08:00
zhitomirskiyi
63590e2e7e restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives" 2011-01-18 16:57:34 -08:00
danielvincent
511a48adde fixed publicscontroller specs 2011-01-18 16:52:11 -08:00
Raphael
3b394c1c89 One more defualt scope out 2011-01-18 16:48:02 -08:00
Raphael
e6e2ba9cfb Take out default scopes 2011-01-18 16:46:52 -08:00
zhitomirskiyi
ef1b7644f3 got rid of more hash from 2011-01-18 16:38:31 -08:00
zhitomirskiyi
3e6a271ad8 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:22:03 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
85bae12a00 Query on guid, not id 2011-01-18 16:07:58 -08:00
Raphael
6ccf8a4d2d Fixed connecting spec, magic import failure disappearance 2011-01-18 16:05:50 -08:00
Raphael
9e5cf1e1a4 Fix person receive urls 2011-01-18 15:21:04 -08:00
Raphael
bad7399eeb Remove yml files from git 2011-01-18 15:18:58 -08:00
Raphael
88ebd14799 Fixture builder working, need to make specs not require a clean db 2011-01-18 14:53:46 -08:00
Raphael
1353929d44 Made specs work with fixtures, spec_helper needs work 2011-01-18 13:31:10 -08:00
zhitomirskiyi
d0074d0d8a no more mongo check in script server 2011-01-18 11:01:09 -08:00
zhitomirskiyi
41c83a7e19 mousedown so that new tab opening would make notification go down 2011-01-18 10:51:05 -08:00
zhitomirskiyi
0cb9f1c0d7 focus publisher on reshare 2011-01-18 10:51:05 -08:00
Raphael
ac3d037dc4 Comments controller spec using fixtures 2011-01-18 10:48:06 -08:00
Raphael
b580b7bd2c Putting fixtures in specs... 2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7 Fix specs in the presence of fixture_builder 2011-01-18 10:25:26 -08:00
Raphael
345d346224 Initial fixture_builder 2011-01-18 10:00:48 -08:00
Raphael
d0af03b723 Merge remote branch 'dorian/820-typo-in-script-server' 2011-01-17 20:08:50 -08:00
Raphael
d0fb37e264 fix database yml example 2011-01-17 20:04:50 -08:00
Raphael
28b7302c9e Specify type again 2011-01-17 19:42:49 -08:00
Raphael
eee9561656 Specify type 2011-01-17 19:40:14 -08:00
Raphael
6474ca9540 display photos correctly 2011-01-17 19:34:33 -08:00
maxwell
0c24510682 remove an invalid spec 2011-01-17 18:33:30 -08:00
zhitomirskiyi
8d86585928 profile spec passes 2011-01-17 18:22:54 -08:00
zhitomirskiyi
8818a9bb6f Merge branch 'master' of github.com:diaspora/diaspora 2011-01-17 18:04:21 -08:00
zhitomirskiyi
c28b5a22fb here you go 2011-01-17 18:03:15 -08:00
Raphael
8bd784e5ab Fix aspect edit 2011-01-17 17:36:36 -08:00
zhitomirskiyi
3f21a05e3e remove s3 setting 2011-01-17 16:46:39 -08:00
Raphael
a6ff90ad20 removing database.yml 2011-01-17 16:17:08 -08:00
zhitomirskiyi
86c2686b9a a little begin rescue magic for uploading to s3 2011-01-17 15:56:06 -08:00
zhitomirskiyi
390e19ecdd some sod modz 2011-01-17 15:56:06 -08:00
zhitomirskiyi
47671ac332 no pod_url 2011-01-17 15:56:06 -08:00