7f013c9160
Use rack-protection from master on sinatra-contrib
2016-07-25 10:14:42 -03:00
595a750e21
Test from sinatra in path and remove the "master" test
...
This means we'll always be testing the latest version of sinatra, no matter what.
Including any PRs sent to both projects, to ensure compatibility.
2016-07-23 12:29:38 +09:00
518bb9282f
Merge branch 'ruby_version' of https://github.com/stjhimy/sinatra-contrib into stjhimy-ruby_version
2016-07-20 14:14:56 +09:00
72291c6466
Always use sinatra from master until it is released
...
This should help avoid some confusion about the failing build
2016-07-19 10:54:36 +09:00
b1fd9f1dd3
Use Mustermann from master until a release is made
...
Since master has a patch which fixes the missing `:+` implementation for
Regular and Sinatra-based patterns.
We can also re-enable the namespace specs for accepting regular expressions for
path concatination.
/cc #200 and #207
2016-07-19 10:46:13 +09:00
c0142101c8
Remove ruby 1.8/1.9 version check
2016-05-09 11:49:42 -03:00
63c07585d0
Add sinatra edge testing and fix git testing for rack, tilt, sinatra
2016-05-03 21:45:18 +09:00
741677743c
Use liquid 2.6.x avoiding duplicated keys warnings on specs
2016-04-14 17:10:18 -03:00
cf3534a64e
Use stable branch from Sinatra for contrib until next stable release
2016-02-10 23:49:23 +09:00
39ce1348c6
Work around another transitive dependency snafu
2015-08-26 18:25:49 -07:00
1c9fa54845
lock libv8 to 3.16.14.7 for 1.8.7
2015-07-01 13:23:37 -04:00
43797c99fe
Fix capture bug with slim from patch by @minad
...
See judofyr/temple#86
Closes #156
Closes #145
2015-05-22 11:43:07 -07:00
bbc888647a
conditionally build ENGINES constant in respond_with to fix jruby dep issues
...
- jruby does not support redcarpet(markdown), yajl
2015-05-15 15:14:56 -04:00
b42f1144ce
Split out JRuby dependencies
2015-05-15 10:10:09 -04:00
c3cd5dfb1c
update deps to support 1.8.7
2015-05-14 21:11:27 -04:00
5bf6050db7
Point to fork of temple with patch to fix tests 🙏
2015-05-14 14:23:00 -07:00
ae3b012597
modernize Gemfile syntax.
2013-04-18 23:33:50 +09:00
9f0268b6af
multi-json implementation
2013-02-12 15:28:34 -05:00
70e33eedbf
prep for travis
2011-08-18 10:11:45 +02:00
f7c0bb4a95
target Sinatra 1.3
2011-08-17 13:20:41 +02:00
22a8c8569f
make the reloader work on 1.8 and jRuby
2011-04-15 18:08:11 -03:00
07a649ab6d
initial commit
2011-03-24 08:43:39 +01:00
stjhimy