Florian Staudacher
118ae2d657
refactored show-page comment cuke to be like normal comment cuke
2012-04-04 15:23:39 +02: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
Maxwell Salzberg
ef74a06d85
reduce timeout to maybe get cukes to pass
2012-04-03 18:04:08 -07:00
Maxwell Salzberg
baf16479b8
add some assets which are for bootstrap which seem to need them to be in public. bootstrap-sass should deal with this
2012-04-03 18:01:05 -07:00
Maxwell Salzberg
0986e412de
well that didnt work... Revert "try reconnecting after every cuke for postgres only to try and deal with travis issues"
...
This reverts commit 1604aedf03
2012-04-03 17:59:51 -07:00
Maxwell Salzberg
1604aedf03
try reconnecting after every cuke for postgres only to try and deal with travis issues
2012-04-03 17:27:28 -07:00
Maxwell Salzberg
f5754d2b71
small fix for jasmie that works in chrome and ff
2012-04-03 17:26:13 -07:00
Maxwell Salzberg
e521ac92f9
make a test slightly dumber for travis
2012-04-03 16:52:34 -07:00
danielgrippi
5459d07339
bump capybara timeout to avoid timeout errorsdefine cucumber step to be pending so travis doesn't freak out
2012-04-03 16:43:44 -07:00
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
Maxwell Salzberg
fb946bd407
remove handle bars template who got lost in the root dir
2012-04-03 16:22:52 -07:00
Maxwell Salzberg
a5b53717ea
small typo fixes, in heroku and seed scripts [ci skip]
2012-04-03 15:02:10 -07:00
Maxwell Salzberg
bb5aa2821d
use the built in asset_sync initializer. add a rake task to bootstrap
...
heroku and asset sync, which puts the S3 config vars in from your app
config.
2012-04-03 14:47:33 -07:00
Steven Hancock
a8843c1036
Fix JSON caching regression
...
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.
Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.
closes #3094
2012-04-02 21:40:16 -07:00
Maxwell Salzberg
4ba3ec0b42
update initializer
2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688
add asset sync gem
2012-04-02 18:32:35 -07:00
danielgrippi
e156947d0b
fix jasmine specs
2012-04-02 18:17:55 -07:00
Maxwell Salzberg
eee5a89382
Merge pull request #3090 from Raven24/ci-stuff
...
css should be delivered by asset pipeline for travis(?)
2012-04-02 17:40:59 -07:00
Maxwell Salzberg
4523add9d2
Merge pull request #3097 from Raven24/fix-comments-error-cuke
...
fix cuke unhappiness I introduced with #3088
2012-04-02 17:39:57 -07:00
Maxwell Salzberg
7ce61fd4b1
Merge pull request #3095 from Raven24/fix-jasmine-comment-error
...
fix jasmine unhappiness I introduced with #3088
2012-04-02 17:39:40 -07:00
Florian Staudacher
c9fa88a1de
fix cuke unhappiness I introduced with #3088
2012-04-03 01:13:44 +02:00
Florian Staudacher
1709036764
fix jasmine unhappiness I introduced with #3088
2012-04-02 21:25:01 +02:00
Steven Hancock
4b41f8bf41
Add a comment about JS runtimes to Gemfile
...
As mentioned in #3078 there may be some confusion about the asset
pipeline's dependency on an ExecJS compatible javascript runtime.
On OSX it should just work, Linux needs Node.js (recommended) or
TheRubyRacer.
This adds a comment to the :assets group to give people more
information.
2012-04-02 01:26:18 -07:00
Steven Hancock
e2e93e8742
Merge pull request #3093 from stevenh512/db-indexes-rebased
...
DB Indexes
2012-04-01 19:35:01 -07:00
Christophe
4279d85776
New index for posts table. interacted_at still missing
2012-04-01 19:16:04 -07:00
Christophe
48571cae37
Indexes on participation table
2012-04-01 19:16:04 -07:00
Daniel Grippi
6f75fb4173
Merge pull request #3088 from Raven24/fix-bmm-2
...
show an error message when creating a comment failed [ci skip]
2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5
Merge pull request #3086 from Raven24/fix-publisher-height
...
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Daniel Grippi
9573bb55ee
Merge pull request #3091 from Raven24/fix-wp-spec
...
make app.views.Post.Wallpaper spec pass
2012-04-01 18:23:21 -07:00
Daniel Grippi
2646352cb1
Merge pull request #3092 from Raven24/self-follow
...
create a dummy-participation js object, for the post to appear as followed by self
2012-04-01 18:22:17 -07:00
Florian Staudacher
ef292c40eb
create a dummy-participation object, that the post appeas followed by self
2012-04-01 22:34:54 +02:00
Florian Staudacher
2a4bc32eb5
make wallpaper-post spec pass
2012-04-01 17:43:33 +02:00
Florian Staudacher
62edcb8c21
css should be delivered by asset pipeline(?)
2012-04-01 13:44:00 +02:00
Jonne Haß
a5a6378eb0
translate 'mark unread' in notifications badge
2012-04-01 13:03:44 +02:00
Maxwell Salzberg
302346bcdb
Merge pull request #3089 from justindthomas/fix-migration
...
change concat() to || for pgSQL
2012-03-31 09:27:53 -07:00
Maxwell Salzberg
9677500a2f
add wait and suppress all the cukes from starting on the specific cucumber task
2012-03-31 01:34:55 -04:00
Maxwell Salzberg
a54fb79bfa
Merge branch 'tubbo-feature/sporkify'
2012-03-31 01:26:41 -04:00
Maxwell Salzberg
adf85e1ec6
adding a bit to tubbo's spork branch
2012-03-31 01:22:46 -04:00
Maxwell Salzberg
98b41d8f1d
update seeds.rb to reflect asset pipeline, and a lil bit of refactoring
2012-03-31 00:15:56 -04:00
Maxwell Salzberg
8e0998ab88
make cukes' wait until use block form, as we were getting some weird parse errors otherwise
2012-03-31 00:15:55 -04:00
Maxwell Salzberg
0e2bcf18d2
the logged out logo is now in the branding folder
2012-03-31 00:15:55 -04:00
Justin Thomas
14a0e9c586
change concat() to || for pgSQL
2012-03-30 11:45:50 -07:00
