Maxwell Salzberg
dca26ee3a3
fix travis button
2011-09-05 10:03:36 -07:00
Jonne Hass
3b279d179f
use env var to determine single process mode in scritp/server
2011-09-05 17:34:05 +03:00
Jonne Hass
b7b9cf6b6d
fixed typo in script/server
2011-09-05 16:41:36 +03:00
Sarah Mei
2d6c2f0b60
Cucumber/spec cleanup. Removed some stray aspect.firsts, which should improve reliability across databases. Removed some cucumber steps we don't use & consolidated duplicate steps.
2011-09-04 23:15:08 -07:00
Sarah Mei
58161b006a
Merge branch 'master' of github.com:diaspora/diaspora
2011-09-04 23:15:02 -07:00
danielgrippi
b6e2647530
remove sass warnings
2011-09-04 23:13:03 -07:00
Sarah Mei
5e388bf4c2
tag markdownify performance test so it isn't run on CI
2011-09-04 23:10:33 -07:00
Sarah Mei
abd8443181
Merge branch 'master' of github.com:diaspora/diaspora
2011-09-04 22:49:54 -07:00
danielgrippi
341d105e75
updated buttons, mixin declarations
2011-09-04 22:48:37 -07:00
Sarah Mei
e143fbf86e
Only build the master branch on travis.
2011-09-04 22:43:17 -07:00
Sarah Mei
97d514dd65
Make connecting users in cucumber more deterministic. Should cut down on spurious failures in comment spec.
2011-09-04 21:50:52 -07:00
Sarah Mei
c678f4732c
A bit of refactoring on person_spec since we got an odd failure on travis
2011-09-04 21:34:00 -07:00
Jonne Hass
c682eb8a7a
updated locales
2011-09-05 02:30:30 +02:00
Maxwell Salzberg
192218f231
update readme language I did not care for; adding build status button from travisci. HUZZAH
2011-09-04 16:06:30 -07:00
Sarah Mei
83696a1d03
Add a ruby 1.8.7 (non-REE) build to travis
2011-09-04 15:06:01 -07:00
Sarah Mei
b1dc5f4aee
Only delete cookies if running in an actual browser.
2011-09-04 13:14:32 -07:00
Sarah Mei
be3a46a23f
Make posts.feature a little more reliable. The Scenario Outlines were sitting on the profile page as the background ran which may have been contributing to the System Exit problem.
2011-09-04 12:27:57 -07:00
Sarah Mei
5b54f84ad2
Clear cookies between features.
2011-09-04 12:26:58 -07:00
Sarah Mei
e3ee2102c9
Merge branch 'master' of github.com:diaspora/diaspora
2011-09-04 11:27:40 -07:00
Sarah Mei
ad009a71dc
Don't run oauth.feature on travis, but run all features locally.
2011-09-04 11:27:30 -07:00
Jonne Hass
d1a5e627ba
export DB in script/server
2011-09-04 19:51:24 +02:00
Sarah Mei
5e7ec82fe4
Moving jasmine into the test group only breaks the jasmine rake tasks, so move it back to both test & development.
2011-09-04 10:04:28 -07:00
Jonne Hass
6403cbded6
note to self: don't use debian manpages for ubuntu stuff…
2011-09-04 16:03:39 +02:00
Jonne Hass
19302078a2
improve aptitude command a bit
2011-09-04 15:55:45 +02:00
Jonne Hass
1a9e0162f9
really fix sed
2011-09-04 15:31:42 +02:00
Jonne Hass
6a268e08d6
fix sed in before-travis.sh
2011-09-04 15:21:07 +02:00
Jonne Hass
03110c466f
use -q2 again for aptitude since -q3 doesn't seem to have any effect
2011-09-04 15:09:34 +02:00
Jonne Hass
835c4447f6
I just want to see if this works :P
...
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
2011-09-04 14:53:28 +02:00
Sarah Mei
689fd7ec94
Include both mysql and pg in the Gemfile tp reduce travis startup time.
2011-09-03 22:48:56 -07:00
Sarah Mei
b2b8e72ab2
Change index name in schema.rb
2011-09-03 22:27:19 -07:00
Sarah Mei
37d4a843a4
Shorten index name for everybody, including mysql & postgres users.
2011-09-03 22:05:32 -07:00
Sarah Mei
bf954f3e6a
Need to rebundle if we switch the Gemfile for postgres
2011-09-03 21:52:57 -07:00
Sarah Mei
7c24a1a1fb
How about we switch the Gemfile *before* we bundle install?
...
PSA: don't drink & code, kids.
2011-09-03 21:50:49 -07:00
Sarah Mei
1cc7026b59
First try at postgresql support on travis.
2011-09-03 21:44:13 -07:00
Sarah Mei
d701581379
Fix 1.9 yaml error caused by asterisks in the glob path.
2011-09-03 20:35:16 -07:00
Sarah Mei
8d95684341
move jasmine before cucumber so we can fail faster on travis
2011-09-03 20:30:26 -07:00
Sarah Mei
f23658f9a2
Up the default wait time so travis is happier.
2011-09-03 19:57:03 -07:00
Sarah Mei
949423ccda
Make YAML::ENGINE syck under ruby 1.9 to fix travis 1.9 build issue
2011-09-03 19:52:39 -07:00
Sarah Mei
6642ee2047
Fix cucumber feature to reflect new aspect dropdown wording
2011-09-03 19:24:19 -07:00
Sarah Mei
8f9a0a032d
Remove debugging output from travis script.
2011-09-03 19:22:01 -07:00
Sarah Mei
460b734b9e
Must bundle exec rake on travis to avoid stack-level-too-deep rake errors.
2011-09-03 19:07:25 -07:00
Sarah Mei
60301d5a93
More debug output in travis. Also, use --without development production in the rebundle, same as in the original bundle.
2011-09-03 18:46:20 -07:00
danielgrippi
66836e53d2
Aspect dropdowns read 'All Aspects' if all aspects are selected
2011-09-03 18:38:12 -07:00
Sarah Mei
aa1aaaa0d8
Add --trace to debug the stack level too deep error on the travis 1.9 build.
2011-09-03 18:30:19 -07:00
Sarah Mei
4f11b75ed1
RAKE jasmine:ci. Duh.
2011-09-03 18:14:26 -07:00
Sarah Mei
024574534b
Add execute bit to before-travis.sh
2011-09-03 18:03:42 -07:00
Sarah Mei
77149a9623
Move travis startup script to its own file. Add GC settings for REE and -q2 for aptitude install.
2011-09-03 17:57:18 -07:00
Sarah Mei
a5b120532a
Use a jasmine fixture with just one post for the comment specs.
2011-09-03 17:51:51 -07:00
Sarah Mei
d46bf5f748
Horrible, horrible hack to re-bundle on the 1.9 build.
2011-09-03 17:24:02 -07:00
Sarah Mei
3619e5f4a1
Add a remove of Gemfile.lock for the 1.9 build.
2011-09-03 17:15:25 -07:00
