Skip to content

Commit

Permalink
Merge tag 'v113'
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/github-pages/version.rb
  • Loading branch information
sskylar committed Jan 12, 2017
2 parents 39298a2 + 2f799bb commit a484999
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/github-pages/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Dependencies
"jekyll-paginate" => "1.1.0",
"jekyll-coffeescript" => "1.0.1",
"jekyll-seo-tag" => "2.1.0",
"jekyll-github-metadata" => "2.2.0",
"jekyll-github-metadata" => "2.3.0",
"jekyll-avatar" => "0.4.2",

# Plugins to match GitHub.com Markdown
Expand Down
1 change: 1 addition & 0 deletions lib/github-pages/plugins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Plugins
jekyll-readme-index
jekyll-default-layout
jekyll-titles-from-headings
jekyll-include-cache
).freeze

# Plugins only allowed locally
Expand Down
2 changes: 1 addition & 1 deletion lib/github-pages/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module GitHubPages
VERSION = 111
VERSION = 113
.to_s + '-siteleaf'.freeze
end
1 change: 1 addition & 0 deletions spec/github-pages/plugins_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
context "versions all whitelisted plugins" do
GitHubPages::Plugins::PLUGIN_WHITELIST.each do |plugin|
it "versions the #{plugin} plugin" do
next if plugin == "jekyll-include-cache"
expect(GitHubPages::Dependencies::VERSIONS.keys).to include(plugin)
end
end
Expand Down

0 comments on commit a484999

Please sign in to comment.