deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bump tilt requirement, unregister plaintext template. fixes #824

Browse source
This commit is contained in:
Thomas Reynolds 2013-03-18 14:11:48 -07:00
parent 46f060ab12
commit c994004aaa
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -21,12 +21,12 @@ gem "less", "~> 2.2", :require => false
gem "stylus", :require => false
platforms :ruby do
gem "therubyracer", "0.10.2"
gem "therubyracer"#, "0.10.2"
gem "redcarpet"
end
platforms :jruby do
gem "therubyrhino", "1.73.5"
gem "therubyrhino"
end
# Middleman itself

2
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -22,6 +22,8 @@ module Middleman
app.define_hook :before_render
app.define_hook :after_render
::Tilt.mappings.delete('html') # WTF, Tilt?
# Activate custom renderers
require "middleman-core/renderers/erb"
app.register Middleman::Renderers::ERb

2
middleman-core/middleman-core-x86-mingw32.gemspec
View file

@ -21,7 +21,7 @@ Gem::Specification.new do |s|
# Core
s.add_dependency("bundler", ["~> 1.1"])
s.add_dependency("rack", ["~> 1.4.1"])
s.add_dependency("tilt", ["~> 1.3.1"])
s.add_dependency("tilt", ["~> 1.3.6"])
# Builder
s.add_dependency("rack-test", ["~> 0.6.1"])

2
middleman-core/middleman-core.gemspec
View file

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
# Core
s.add_dependency("bundler", ["~> 1.1"])
s.add_dependency("rack", ["~> 1.4.1"])
s.add_dependency("tilt", ["~> 1.3.1"])
s.add_dependency("tilt", ["~> 1.3.6"])
# Builder
s.add_dependency("rack-test", ["~> 0.6.1"])