Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

depend on Tilt 1.2

Conflicts:

	test/markaby_test.rb
  • Loading branch information...
commit e2940bc7cfa6d2472a636b2024b44c06a0f74c57 1 parent 4cfec95
Konstantin Haase rkh authored
Showing with 1 addition and 2 deletions.
  1. +1 −1  sinatra.gemspec
  2. +0 −1  test/templates_test.rb
2  sinatra.gemspec
View
@@ -116,7 +116,7 @@ Gem::Specification.new do |s|
s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
s.add_dependency 'rack', '~> 1.1'
- s.add_dependency 'tilt', '~> 1.1'
+ s.add_dependency 'tilt', '~> 1.2'
s.add_development_dependency 'rake'
s.add_development_dependency 'shotgun', '~> 0.6'
s.add_development_dependency 'rack-test', '>= 0.5.6'
1  test/templates_test.rb
View
@@ -5,7 +5,6 @@
class TestTemplate < Tilt::Template
def prepare
end
- alias compile! prepare # for tilt < 0.7
def evaluate(scope, locals={}, &block)
inner = block ? block.call : ''
Please sign in to comment.
Something went wrong with that request. Please try again.