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

Handle breaking padrino change. Closes #1349

Browse source
This commit is contained in:
Thomas Reynolds 2014-08-13 20:24:20 -07:00
parent 207da11372
commit 2b928a326c
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,6 +1,13 @@
master master
=== ===
3.3.5
===
* Update Padrino to ~> 0.12.3 (removed breadcrumb helper)
* Update compass-import-once to 1.0.5
* Fix issue with Slim partials. #1327
3.3.4 3.3.4
=== ===

2
middleman-core/lib/middleman-core/version.rb
View file

@ -1,5 +1,5 @@
module Middleman module Middleman
# Current Version # Current Version
# @return [String] # @return [String]
VERSION = '3.3.4' unless const_defined?(:VERSION) VERSION = '3.3.5' unless const_defined?(:VERSION)
end end

1
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -30,7 +30,6 @@ 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.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

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

@ -33,7 +33,7 @@ Gem::Specification.new do |s|
# Helpers # Helpers
s.add_dependency("activesupport", ["~> 4.1.0"]) s.add_dependency("activesupport", ["~> 4.1.0"])
s.add_dependency("padrino-helpers", ["~> 0.12.1"]) s.add_dependency("padrino-helpers", ["~> 0.12.3"])
# Watcher # Watcher
s.add_dependency("listen", [">= 2.7.9", "< 3.0"]) s.add_dependency("listen", [">= 2.7.9", "< 3.0"])