1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Commit graph

34 commits

Author SHA1 Message Date
Konstantin Haase
1f6d9d52a7 clean up gemfile a little 2011-06-16 11:11:09 +02:00
Tim Felgentreff
c594558cf4 adjust gemfile for maglev. coffee-script broken b/c json gem doesn't work correctly 2011-06-16 10:06:44 +02:00
Konstantin Haase
81ff7a3180 Merge branch 'master' of https://github.com/timfel/sinatra into timfel-master
Conflicts:
	Gemfile
2011-06-15 11:56:47 +02:00
Tim Felgentreff
fa5f9a4983 Exclude liquid for Maglev for now, it doesn't load. 2011-06-15 02:48:06 -07:00
Tim Felgentreff
e187ec85ee Make CI Reporter optional 2011-06-09 13:46:30 +02:00
Tim Felgentreff
4f013c2ea1 add ci_reporter, so you may have nice junit reports on the CI 2011-06-09 13:41:24 +02:00
Konstantin Haase
89c6a38a15 Revert "enable bluecloth"
This reverts commit 52dc53222d.
2011-06-05 16:13:55 +02:00
Konstantin Haase
52dc53222d enable bluecloth 2011-06-05 15:38:22 +02:00
Konstantin Haase
eaee326bed less 2.0 is not supported atm 2011-06-04 09:32:48 +02:00
Konstantin Haase
f3f34f8d3e adjust gemfile to install on maglev 2011-05-20 14:17:59 +02:00
Konstantin Haase
6fbee528fa add redcarpet to gemfile and requirements docs 2011-05-17 18:41:52 +02:00
Konstantin Haase
8dc9e35ff3 jruby 1.6.1 now is able to gem install cexts out of the box 2011-05-17 11:40:14 +02:00
Konstantin Haase
5a899b2df3 do not use git version in Gemfile if env vars for tilt or rack is not set 2011-05-11 09:38:11 +02:00
Konstantin Haase
27b1008b26 make the bundle install on macruby 2011-05-10 16:32:52 +02:00
Konstantin Haase
cf0ed2b0ec RedCloth has issues on 1.9.3 2011-05-03 12:30:49 +02:00
Konstantin Haase
3909b5e53f do not load gemspec in Gemfile 2011-05-03 12:30:37 +02:00
Konstantin Haase
01ae70e2b3 allow setting rack dependency with env var (for CI) 2011-05-03 09:11:15 +02:00
Konstantin Haase
cb5276707d Merge branch 'template-docs' 2011-04-27 08:00:49 +02:00
Konstantin Haase
103bfa832b remove bluecloth from bundle for now (broken) 2011-04-27 08:00:38 +02:00
Konstantin Haase
a7bf182e08 sass 3.1 has been released 2011-04-26 12:32:19 +02:00
Konstantin Haase
9ce9e543e0 add support for creole templates 2011-04-15 11:59:06 +02:00
Konstantin Haase
4b8aaef0b4 test all mardown engines if available 2011-04-15 11:00:07 +02:00
Konstantin Haase
652411f832 avoid nil.dup in Gemfile 2011-04-14 08:59:39 +02:00
Konstantin Haase
33cde76d37 allow setting tilt version via env var 2011-04-13 13:52:05 +02:00
Konstantin Haase
91992c99f4 check JS availability for CoffeeScript tests properly 2011-04-11 12:46:21 +02:00
Konstantin Haase
cacd473801 add therubyracer to gemfile (needed to run coffeescript tests if there are no alternatives) 2011-03-30 18:40:15 +02:00
Konstantin Haase
ee2e348f5d Merge branch 'drop-1.8.6'
Conflicts:
	Gemfile
	README.rdoc
2011-03-19 10:15:58 +01:00
Konstantin Haase
6fbd58f950 JRuby 1.6.0 and Rubinius 1.2.3 have been released 2011-03-17 11:28:06 +01:00
Konstantin Haase
66a7db6c9e drop 1.8.6 support 2011-02-26 17:06:11 +01:00
Konstantin Haase
64f60526c0 Use platforms properly in Gemfile, even though bundler is broken. 2011-02-26 15:48:14 +01:00
Konstantin Haase
79ae9c8abc typo in Gemfile comment 2011-02-21 14:05:02 +01:00
Konstantin Haase
d269bf5a1e add some test guards for rbx 2011-02-21 11:54:26 +01:00
Konstantin Haase
4ede00c932 fix Gemfile for 1.8.6 2011-02-21 11:35:52 +01:00
Konstantin Haase
5a3f133d2f Add Gemfile, fixes #152. 2011-02-18 10:26:42 +01:00