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

rollback some versions

Browse source
This commit is contained in:
Thomas Reynolds 2013-05-03 11:24:05 -07:00
parent fdc5154462
commit 4964022998
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -4,6 +4,9 @@ master
* DataStore may now be accessed like a hash with #[] and #has_key?. #880 * DataStore may now be accessed like a hash with #[] and #has_key?. #880
* The i18n extension now supports providing localized templates as separate files, like index.es.html.haml. #816, #823 * The i18n extension now supports providing localized templates as separate files, like index.es.html.haml. #816, #823
* The list of regular expressions for which files are ignored by the file watcher are now configurable. * The list of regular expressions for which files are ignored by the file watcher are now configurable.
* Revert to Thor 0.15.x
* Revert to padrino-helpers 0.10.x (dependency hell)
* Drop i18n dep to match activesupport at 0.6.1
3.1.0.beta.2 3.1.0.beta.2
=== ===
@ -16,7 +19,6 @@ master
* Update Rack dependency to 1.5.x * Update Rack dependency to 1.5.x
* Update to Listen 1.0.x * Update to Listen 1.0.x
* Update to padrino-helpers 0.11.x * Update to padrino-helpers 0.11.x
* Update to Thor 0.17.x
* Update uglifier to 2.0.x * Update uglifier to 2.0.x
* Convert all of middleman-more to new class-based Extensions * Convert all of middleman-more to new class-based Extensions

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

@ -413,7 +413,8 @@ module Middleman
@_out_buf = _buf_was @_out_buf = _buf_was
end end
concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content } # concat_safe_content
concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
ensure ensure
@current_engine = engine_was @current_engine = engine_was
end end

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

@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_dependency("rack-test", ["~> 0.6.1"]) s.add_dependency("rack-test", ["~> 0.6.1"])
# CLI # CLI
s.add_dependency("thor", ["~> 0.17.0"]) s.add_dependency("thor", ["~> 0.15.2"])
# Helpers # Helpers
s.add_dependency("activesupport", ["~> 3.2.6"]) s.add_dependency("activesupport", ["~> 3.2.6"])

2
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -14,7 +14,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
app.helpers ::Padrino::Helpers::RenderHelpers app.helpers ::Padrino::Helpers::RenderHelpers
app.helpers ::Padrino::Helpers::NumberHelpers app.helpers ::Padrino::Helpers::NumberHelpers
# app.helpers ::Padrino::Helpers::TranslationHelpers # app.helpers ::Padrino::Helpers::TranslationHelpers
app.helpers ::Padrino::Helpers::Breadcrumbs # app.helpers ::Padrino::Helpers::Breadcrumbs
app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones' app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
end end

4
middleman-more/middleman-more.gemspec
View file

@ -24,6 +24,6 @@ Gem::Specification.new do |s|
s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("coffee-script", ["~> 2.2.0"])
s.add_dependency("execjs", ["~> 1.4.0"]) s.add_dependency("execjs", ["~> 1.4.0"])
s.add_dependency("kramdown", ["~> 1.0.0"]) s.add_dependency("kramdown", ["~> 1.0.0"])
s.add_dependency("i18n", ["~> 0.6.4"]) s.add_dependency("i18n", ["~> 0.6.1"])
s.add_dependency("padrino-helpers", ["0.11.1"]) s.add_dependency("padrino-helpers", ["0.10.7"])
end end