Ben Hollis d7fd48ef7d Merge branch 'v3-stable' ... Conflicts: middleman-core/lib/middleman-more/extensions/asset_hash.rb		2014-06-28 18:48:49 -07:00
..
core_extensions	Rubocop auto fix	2014-06-16 09:05:24 -07:00
extensions	Merge branch 'v3-stable'	2014-06-28 18:48:49 -07:00
meta_pages	Fix meta pages	2014-06-14 11:31:53 -07:00
middleware	Rubocop auto fix	2014-06-16 09:05:24 -07:00
renderers	Rubocop auto fix	2014-06-16 09:05:24 -07:00
sitemap	Rubocop auto fix	2014-06-16 09:05:24 -07:00
step_definitions	Do not use ShowExceptions during tests, it confuses things	2014-06-14 13:05:32 -07:00
application.rb	Separate Environments from Modes	2014-06-11 10:28:30 -07:00
auto_gem_extensions.rb	Move methods for handling automatic extension discovery and rubygems enumeration into their own file.	2014-05-11 00:27:12 -07:00
config_context.rb	Turn routing into an extension	2014-06-14 11:31:52 -07:00
configuration.rb	Make rubocop TrivialAccessors warnings less annoying	2014-05-26 16:53:23 -07:00
core_extensions.rb	rubocop	2014-06-14 11:31:53 -07:00
extension.rb	Merge branch 'v3-stable'	2014-06-28 18:48:49 -07:00
extensions.rb	Separate Environments from Modes	2014-06-11 10:28:30 -07:00
file_renderer.rb	Clean up some Rubocop warnings that were previously suppressed.	2014-05-24 00:37:46 -07:00
load_paths.rb	Move methods for handling automatic extension discovery and rubygems enumeration into their own file.	2014-05-11 00:27:12 -07:00
logger.rb	hashrocket killa	2014-04-29 10:50:21 -07:00
meta_pages.rb	Change the auto activated extension feature to allow specifying different lifecycle events to activate at, allowing more extensions to auto activate.	2014-05-25 21:12:40 -07:00
preview_server.rb	Clean up some Rubocop warnings that were previously suppressed.	2014-05-24 00:37:46 -07:00
profiling.rb	Clean up some Rubocop warnings that were previously suppressed.	2014-05-24 00:37:46 -07:00
sitemap.rb	Use alias_method instead of defining an alias method for current_page	2014-05-26 17:13:10 -07:00
step_definitions.rb	arbua jruby support	2014-04-04 10:56:47 -07:00
template_context.rb	Separate Environments from Modes	2014-06-11 10:28:30 -07:00
template_renderer.rb	Extract compass support into extension, rewrite all features that rely on it to be pure Ruby	2014-06-03 09:01:46 -07:00
util.rb	Fixed implementation of Middleman::Util#path_match, added tests for it	2014-06-16 21:44:19 -07:00
version.rb	prep	2014-05-24 19:27:56 +09:00