Commit graph

5402 commits

Author SHA1 Message Date
Raphael
1353929d44 Made specs work with fixtures, spec_helper needs work 2011-01-18 13:31:10 -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
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0c8aca3ef8 rebasing 2011-01-17 15:56:06 -08:00
zhitomirskiyi
7ef89acf81 added the redirect to the nginx conf 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0f9dc4954a added a task to upload 2011-01-17 15:56:06 -08:00
danielvincent
7477a22421 safeguard on absolutify rake task 2011-01-17 15:56:06 -08:00
danielvincent
7f87825186 fixed nil error in migration when dealing with remote images 2011-01-17 15:56:06 -08:00
danielvincent
1d52e06532 added rake task and spec for absolutifying existing image links 2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Dorian
29ec257e14 Typo in script/server : redis.cont → redis.conf 2011-01-18 00:44:21 +01:00
Raphael
bd4efe8c2d Escape youtube titles 2011-01-17 15:39:46 -08:00
zhitomirskiyi
baac8199da MS IZ proper file requiring 2011-01-17 15:27:38 -08:00
zhitomirskiyi
3d4cf4d8d5 IZ MS required a file needed by the import 2011-01-17 14:56:30 -08:00
zhitomirskiyi
fc92779ddc redirect after contact destroy 2011-01-17 14:46:38 -08:00
zhitomirskiyi
be92f3866c IZ MS fix 500 on commnet notificaions 2011-01-17 14:46:38 -08:00
Raphael
68f2528f23 production in database yml example 2011-01-17 14:38:06 -08:00
Raphael
db417abc18 Fix person show 2011-01-17 14:30:57 -08:00
Raphael
a7e30adc28 Better test for unique contacts 2011-01-17 14:23:50 -08:00
Raphael
4ba58d8132 Simplify hashes_for_contacts 2011-01-17 14:23:50 -08:00
Raphael
6410355d71 Fix aspect edit page 2011-01-17 14:23:50 -08:00
Raphael
6eb0dfb43f Improve User#posts_from 2011-01-17 14:23:50 -08:00
zhitomirskiyi
79b613b0e5 MS IZ notifications now contain helpful test 2011-01-17 14:07:21 -08:00
Maxwell Salzberg
254c411bd9 prevent searching with spaces 2011-01-17 13:48:52 -08:00
Raphael
72785a69cb Correct ordering problem in posts_from 2011-01-17 12:21:38 -08:00
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
MrZYX
f17ba7b4eb updated locales 2011-01-16 19:52:11 +01:00
Sarah Mei
dff4119765 Expose gem upgrade failures in CI. 2011-01-15 21:03:03 -08:00
Sarah Mei
bb04224187 Add db:migrate to cruise task for mysql branch 2011-01-15 19:39:01 -08:00
Sarah Mei
910ae49fca Lock down gem versions & github refs in mysql branch because it's got that same damn aws problem. 2011-01-15 15:23:34 -08:00
Sarah Mei
2c91bfca96 Fix spec that fails under ruby 1.9. 2011-01-15 15:00:45 -08:00
Sarah Mei
eeba0e7a63 Remove a spec that tests a method that doesn't exist anymore. 2011-01-15 14:28:15 -08:00