Commit graph

11476 commits

Author SHA1 Message Date
Florian Staudacher
d7eb4b242f this seems to be in fact a bug in ruby 1.9.2, disabled for now
... when running with 1.9.3 everything's peachy :/
2012-04-06 03:42:37 +02:00
Florian Staudacher
518346deab try setting a higher swappiness, take other val for mem calculation 2012-04-06 01:55:07 +02:00
Florian Staudacher
248e9d9ae7 add more output (swapping), increase swapfile size
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
2012-04-06 01:16:37 +02:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Jonne Haß
469c23138e Merge pull request #3114 from Raven24/swapfile
create a 64MB swafile on travis
2012-04-05 15:33:40 -07:00
Jonne Haß
8744c6017d Merge pull request #3113 from ujdhesa/patch-1
Updating the translation for sq - part I
2012-04-05 15:32:10 -07:00
Florian Staudacher
b6a56ca52c create a 64MB swafile on travis 2012-04-06 00:24:08 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Maxwell Salzberg
8de9ce9963 Merge branch 'Raven24-memory-control' 2012-04-05 14:29:52 -07:00
Maxwell Salzberg
e1d86bddcf some tweaks so it fails gracefully on systems that do not have free command 2012-04-05 14:29:41 -07:00
Florian Staudacher
fc941fa88b try monitoring used memory an GC by that 2012-04-05 22:21:30 +02:00
Maxwell Salzberg
21667768aa cucumber should not fail with pending steps :( 2012-04-05 12:49:56 -07:00
Maxwell Salzberg
20fee66eee dont do speedup magic on travis 2012-04-05 12:28:07 -07:00
Maxwell Salzberg
2e86d069b8 try two seconds 2012-04-05 12:15:17 -07:00
Maxwell Salzberg
f65a3d760e defer gc for half as long to prevent travis dying 2012-04-05 12:08:15 -07:00
Maxwell Salzberg
a36d5558db use merge not merge! so we dont create false user objects 2012-04-05 11:42:32 -07:00
Maxwell Salzberg
3ecd920cd7 Merge branch 'speedier-tests' of https://github.com/Raven24/diaspora into Raven24-speedier-tests 2012-04-05 10:06:05 -07:00
Florian Staudacher
024f1fee74 disable jQuery effects for tests
... might buy us a few seconds
2012-04-05 16:12:45 +02:00
Florian Staudacher
90387e83f8 speed up cukes by deferring GC
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

this speeds up tests from 9min 47sec to 9min 16sec on my machine
(6% improvement)
2012-04-05 16:01:58 +02:00
Florian Staudacher
4051651737 speeding up rspec by deferring garbage collection
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

on my machine the rspec tests went from taking 5min 02sec to 3min 29sec :O
(31% improvement)
2012-04-05 15:59:23 +02:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip]
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
2012-04-05 15:55:00 +02:00
Maxwell Salzberg
d53b7b5f9a fix trumpeter spec 2012-04-04 23:05:41 -07:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
danielgrippi
169fc743d5 update feature to pending outdated assertion 2012-04-04 19:20:00 -07:00
Maxwell Salzberg
2fd0905591 dump more data in invite rake task 2012-04-04 19:08:36 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Jonne Haß
5866ebe638 using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip] 2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9 add favicon back 2012-04-04 13:00:25 -07:00
Maxwell Salzberg
875ec11afc Merge pull request #3105 from Raven24/evil-comment-cuke
refactored show-page comment cuke to be like normal comment cuke
2012-04-04 12:01:19 -07:00
Maxwell Salzberg
e61ed383aa disable postgres for now; there is a problem with travis' postgres, and they are planning to upgrade to postgres9 tomorrow, so we can re-enable it ASAP after that gets sorted 2012-04-04 11:03:37 -07:00
Maxwell Salzberg
f36e081a04 mark the trumpter mentioning spec wip so travis rake cucumber returns the right response code if it is green 2012-04-04 10:41:13 -07:00
Maxwell Salzberg
0216385991 Merge pull request #3102 from stevenh512/fix-asset-sync
Asset Sync causes asset precompilation to fail
2012-04-04 10:14:53 -07:00
Florian Staudacher
118ae2d657 refactored show-page comment cuke to be like normal comment cuke 2012-04-04 15:23:39 +02:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
2012-04-04 04:19:37 -07:00
Maxwell Salzberg
f86aab3fe2 start building rails3.2 branch [ci skip] 2012-04-04 00:17:06 -07:00
Maxwell Salzberg
78146a95d9 try a much longer wait time and see if that makes things pass on travis :*( 2012-04-03 23:03:11 -07:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -07:00
Maxwell Salzberg
7b3e2d7680 update spork, rspec, cucumber, and selenium webdriver 2012-04-03 22:54:15 -07:00
Maxwell Salzberg
16354ae712 jammit rip 2012-04-03 22:53:53 -07:00
Maxwell Salzberg
cf3776fde2 remove webmock from cucumber to try and fix the travis timeout errors :( 2012-04-03 22:16:51 -07:00
Maxwell Salzberg
518d2be1e1 use pretty formatter on CI for great justice 2012-04-03 21:51:18 -07:00
Maxwell Salzberg
f6eec580a0 collect invite tokens here, because why not 2012-04-03 19:57:19 -07:00
Maxwell Salzberg
7a37c0f42a dumb rake task to pipe user emails who have failed invites for
savekeeping [ci skip]
2012-04-03 19:01:54 -07:00