begin prepping beta.1
This commit is contained in:
parent
b666a7aaee
commit
e4b7d4fff0
|
@ -47,7 +47,7 @@ module Middleman::Cli
|
|||
end
|
||||
|
||||
dir = Dir.mktmpdir
|
||||
|
||||
|
||||
begin
|
||||
branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
|
||||
|
||||
|
|
|
@ -187,7 +187,7 @@ module Middleman
|
|||
end
|
||||
|
||||
def key?(key)
|
||||
( @local_data.keys + @local_sources.keys + @callback_sources.keys ).include?(key.to_s)
|
||||
(@local_data.keys + @local_sources.keys + @callback_sources.keys).include?(key.to_s)
|
||||
end
|
||||
|
||||
alias_method :has_key?, :key?
|
||||
|
|
|
@ -71,9 +71,9 @@ module Middleman
|
|||
ProxyResource.new(app.sitemap, path, target).tap do |p|
|
||||
md = metadata.dup
|
||||
p.add_metadata(
|
||||
locals: md.delete(:locals) || {},
|
||||
page: md.delete(:data) || {},
|
||||
options: md
|
||||
locals: md.delete(:locals) || {},
|
||||
page: md.delete(:data) || {},
|
||||
options: md
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -274,7 +274,7 @@ module Middleman
|
|||
types = Set.new([@type])
|
||||
|
||||
::Middleman::SourceFile.new(
|
||||
path.relative_path_from(@directory), path, @directory, types)
|
||||
path.relative_path_from(@directory), path, @directory, types)
|
||||
end
|
||||
|
||||
# Notify callbacks for a file given an array of callbacks
|
||||
|
|
|
@ -81,7 +81,6 @@ module Middleman
|
|||
self[method]
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
module Middleman
|
||||
# Current Version
|
||||
# @return [String]
|
||||
VERSION = '4.0.0.alpha.6' unless const_defined?(:VERSION)
|
||||
VERSION = '4.0.0.beta.1' unless const_defined?(:VERSION)
|
||||
end
|
||||
|
|
|
@ -51,5 +51,5 @@ Gem::Specification.new do |s|
|
|||
s.add_dependency('execjs', ['~> 2.0'])
|
||||
|
||||
# Testing
|
||||
s.add_dependency('contracts', ['~> 0.4'])
|
||||
s.add_dependency('contracts', ['~> 0.5.0'])
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue