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

Merge remote-tracking branch 'origin/v3-stable'

Browse source 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
This commit is contained in:
Ben Hollis 2014-02-22 18:11:37 -08:00
commit 7b46fd6524
278 changed files with 2390 additions and 1479 deletions
Download patch file Download diff file Expand all files Collapse all files

5
middleman-core/lib/middleman-core/application.rb
View file

@ -3,7 +3,7 @@ require 'i18n'
# Don't fail on invalid locale, that's not what our current
# users expect.
::I18n.config.enforce_available_locales = false
::I18n.enforce_available_locales = false
# Use ActiveSupport JSON
require 'active_support/json'
@ -41,6 +41,9 @@ module Middleman
# Ready (all loading and parsing of extensions complete) hook
define_hook :ready
# Runs before the build is started
define_hook :before_build
# Runs after the build is finished
define_hook :after_build