Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable

middleman-core/features/tilde_directories.feature

@@ -0,0 +1,14 @@
+@encoding
+
+Feature: Tilde directories
+  In order to support ~ characters in directories
+
+  Scenario: Build directories with containing ~ characters in their name
+    Given a fixture app "empty-app"
+    And a file named "source/~notexistinguser/index.html" with:
+    """
+    It works!
+    """
+    And the Server is running
+    When I go to "/~notexistinguser/index.html"
+    Then I should see "It works!"

middleman-core/lib/middleman-core/core_extensions/front_matter.rb

@@ -127,8 +127,7 @@ module Middleman::CoreExtensions
       # @param [String] path
       # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
       def frontmatter_and_content(path)
-        full_path = File.expand_path(path, @app.source_dir)
-
+        full_path = File.expand_path(File.join(@app.source_dir, path))
         content = File.read(full_path)
         data = {}
 

middleman-core/lib/middleman-core/version.rb

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