Ben Hollis
|
4745418200
|
Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
.travis.yml
Gemfile
middleman-core/lib/middleman-core/version.rb
middleman-core/middleman-core-x86-mingw32.gemspec
middleman-core/middleman-core.gemspec
|
2013-03-02 22:32:03 -08:00 |
|
Thomas Reynolds
|
6cee2d74f5
|
adapt to bundler changes, add ruby 2.0 to tests, prep release
|
2013-02-24 13:44:24 -08:00 |
|
|
Ben Hollis
|
1d3503b56c
|
OK maybe not Rubinius
|
2013-02-15 23:00:53 -08:00 |
|
|
Ben Hollis
|
00f23cad8e
|
Test on more rubies
|
2013-02-15 22:15:13 -08:00 |
|
|
Thomas Reynolds
|
6791dc431c
|
Let travis know we're using submodules
|
2012-07-02 21:43:17 -07:00 |
|
|
Thomas Reynolds
|
bd9d9d0f93
|
travishatesme
|
2012-06-18 16:53:22 -07:00 |
|
|
Thomas Reynolds
|
4ea2f6f7ed
|
Sick of jruby breaking travis
|
2012-06-17 11:42:39 -07:00 |
|
|
Thomas Reynolds
|
bb659bb5be
|
jruby 1.9 fixed itself?
|
2012-05-24 11:33:51 -07:00 |
|
|
Thomas Reynolds
|
1022e63cee
|
Avoid bundler on travis
|
2012-05-10 16:32:43 -07:00 |
|
|
Thomas Reynolds
|
ed50d4326a
|
Try to avoid running bundler in tests on Travis
|
2012-05-10 16:07:11 -07:00 |
|
|
Thomas Reynolds
|
3f048011ab
|
Stop testing on Rubinius
|
2012-05-10 11:25:21 -07:00 |
|
|
Thomas Reynolds
|
d1d59ca5ca
|
always test jruby now
|
2012-05-03 15:41:07 -07:00 |
|
|
Thomas Reynolds
|
527c987281
|
Attempt to avoid redcarpet tests on jruby
|
2012-05-02 16:28:04 -07:00 |
|
|
Thomas Reynolds
|
c8e79f5755
|
test rbx
|
2012-04-26 13:47:07 -07:00 |
|
|
Thomas Reynolds
|
a13db4f16e
|
derp only allow compass 0.12
|
2012-03-14 20:04:29 -07:00 |
|
|
Thomas Reynolds
|
7d2821a472
|
travis update
|
2012-03-14 20:02:49 -07:00 |
|
|
Thomas Reynolds
|
576463f361
|
fix merge
|
2012-03-01 13:24:56 -08:00 |
|
|
Thomas Reynolds
|
5b2381f6eb
|
sorry jruby
|
2012-02-18 10:04:28 -08:00 |
|
|
Thomas Reynolds
|
3cabbcf5a4
|
test jruby
|
2012-02-18 09:02:16 -08:00 |
|
|
Thomas Reynolds
|
ceb5f53d57
|
enable jruby
|
2012-01-30 10:10:38 -08:00 |
|
|
Thomas Reynolds
|
73913f0ace
|
Start getting middleman-more tests passing. About 50% done
|
2011-12-29 19:04:39 -08:00 |
|
|
Thomas Reynolds
|
dd8391be93
|
Remove jRuby hacks
|
2011-12-24 16:09:07 -08:00 |
|
|
Thomas Reynolds
|
79ded54e9c
|
fix cli docs
|
2011-12-21 13:23:43 -08:00 |
|
|
Thomas Reynolds
|
c0ba3e2946
|
early attempt to fix jruby
|
2011-12-20 17:03:36 -08:00 |
|
|
Thomas Reynolds
|
05e2ec15ca
|
remove rbx and jruby testing
|
2011-11-10 16:26:09 -08:00 |
|
|
Thomas Reynolds
|
190c563d3e
|
add rbx and jruby to travis
|
2011-10-26 17:02:50 -07:00 |
|
|
Thomas Reynolds
|
38c21cc82b
|
start testing 1.9.3
|
2011-10-14 13:03:23 -07:00 |
|
|
Thomas Reynolds
|
8ef8680389
|
remove jruby tests for now
|
2011-08-31 13:31:16 -07:00 |
|
Thomas Reynolds
|
5f2df57f33
|
add jruby to test languages
|
2011-08-19 16:54:17 -07:00 |
|
|
Thomas Reynolds
|
182926a444
|
travis ci
|
2011-08-05 11:53:26 -07:00 |
|