Merge branch 'master' into version-config

This commit is contained in:
Ben Balter 2016-02-17 14:56:57 -05:00
Родитель d046cc1be2 4e2783b631
Коммит 7ccac04706
3 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -45,7 +45,7 @@ Mercenary.program(:"github-pages") do |p|
cname_path = File.expand_path "CNAME", Dir.pwd cname_path = File.expand_path "CNAME", Dir.pwd
raise "No CNAME file found in current directory" unless File.exists?(cname_path) raise "No CNAME file found in current directory" unless File.exists?(cname_path)
cname = File.open(cname_path).read.strip cname = File.open(cname_path).read.strip
check = GitHubPages::HealthCheck.new(cname) check = GitHubPages::HealthCheck.check(cname)
puts "Checking domain #{cname}..." puts "Checking domain #{cname}..."
if check.valid? if check.valid?
puts "Everything looks a-okay! :)" puts "Everything looks a-okay! :)"

Просмотреть файл

@ -24,13 +24,13 @@ module GitHubPages
# Plugins # Plugins
"jemoji" => "0.5.1", "jemoji" => "0.5.1",
"jekyll-mentions" => "1.0.0", "jekyll-mentions" => "1.0.1",
"jekyll-redirect-from" => "0.9.1", "jekyll-redirect-from" => "0.9.1",
"jekyll-sitemap" => "0.10.0", "jekyll-sitemap" => "0.10.0",
"jekyll-feed" => "0.3.1", "jekyll-feed" => "0.3.1",
"jekyll-gist" => "1.4.0", "jekyll-gist" => "1.4.0",
"jekyll-paginate" => "1.1.0", "jekyll-paginate" => "1.1.0",
"github-pages-health-check" => "0.6.1", "github-pages-health-check" => "1.0.1",
"jekyll-coffeescript" => "1.0.1", "jekyll-coffeescript" => "1.0.1",
"jekyll-seo-tag" => "1.0.0", "jekyll-seo-tag" => "1.0.0",
} }

Просмотреть файл

@ -1,3 +1,3 @@
module GitHubPages module GitHubPages
VERSION = 48 VERSION = 49
end end