Merge remote-tracking branch 'origin/v3-stable'
Conflicts: middleman-core/lib/middleman-core/extension.rb
This commit is contained in:
commit
c9a640a3e2
|
@ -35,7 +35,6 @@ require 'middleman-more/core_extensions/i18n'
|
|||
begin
|
||||
require 'middleman-more/core_extensions/compass'
|
||||
rescue LoadError
|
||||
$stderr.puts "Compass not installed: #{$!}"
|
||||
end
|
||||
|
||||
###
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
require 'active_support/core_ext/class/attribute'
|
||||
require 'active_support/core_ext/module/delegation'
|
||||
require 'active_support/core_ext/class/attribute'
|
||||
|
||||
module Middleman
|
||||
|
||||
class Extension
|
||||
class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
|
||||
class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false
|
||||
|
|
|
@ -47,10 +47,14 @@ module Middleman
|
|||
::Tilt.prefer(markdown_engine_klass, *markdown_exts)
|
||||
end
|
||||
rescue LoadError
|
||||
# If they just left it at the default engine and don't happen to have it,
|
||||
# then they're using middleman-core bare and we shouldn't bother them.
|
||||
if config.setting(:markdown_engine).value_set?
|
||||
logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
alias :included :registered
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue