Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/github/pages-gem
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/github-pages/version.rb
  • Loading branch information
sskylar committed Dec 20, 2016
2 parents fedacba + ef5f2c3 commit 39298a2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ A simple Ruby Gem to bootstrap dependencies for setting up and maintaining a loc
## Usage

1. Add the following to your project's Gemfile:
_Note: Forcing the version with `'104'` is a temporary workaround to avoid [this Bundler issue](https://github.com/bundler/bundler/issues/5154)._
_Note: Forcing the version with `'109'` is a temporary workaround to avoid [this Bundler issue](https://github.com/bundler/bundler/issues/5154)._

```ruby
gem 'github-pages', '104', group: :jekyll_plugins
gem 'github-pages', '109', group: :jekyll_plugins
```

2. Run `bundle install`
Expand Down
6 changes: 3 additions & 3 deletions lib/github-pages/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Dependencies
# Misc
"liquid" => "3.0.6",
"rouge" => "1.11.1",
"github-pages-health-check" => "1.2.0",
"github-pages-health-check" => "1.3.0",

# Plugins
"jekyll-redirect-from" => "0.11.0",
Expand All @@ -34,9 +34,9 @@ class Dependencies
"jekyll-mentions" => "1.2.0",
"jekyll-relative-links" => "0.2.1",
"jekyll-optional-front-matter" => "0.1.2",
"jekyll-readme-index" => "0.0.2",
"jekyll-readme-index" => "0.0.3",
"jekyll-default-layout" => "0.1.4",
"jekyll-titles-from-headings" => "0.1.2",
"jekyll-titles-from-headings" => "0.1.3",

# Pin listen because it's broken on 2.1 & that's what we recommend.
# https://github.com/guard/listen/pull/371
Expand Down
18 changes: 15 additions & 3 deletions lib/github-pages/plugins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,21 @@ class Plugins

# Themes
THEMES = {
"minima" => "2.0.0",
"jekyll-swiss" => "0.4.0",
"jekyll-theme-primer" => "0.1.1"
"minima" => "2.0.0",
"jekyll-swiss" => "0.4.0",
"jekyll-theme-primer" => "0.1.5",
"jekyll-theme-architect" => "0.0.3",
"jekyll-theme-cayman" => "0.0.3",
"jekyll-theme-dinky" => "0.0.3",
"jekyll-theme-hacker" => "0.0.3",
"jekyll-theme-leap-day" => "0.0.3",
"jekyll-theme-merlot" => "0.0.3",
"jekyll-theme-midnight" => "0.0.3",
"jekyll-theme-minimal" => "0.0.3",
"jekyll-theme-modernist" => "0.0.3",
"jekyll-theme-slate" => "0.0.3",
"jekyll-theme-tactile" => "0.0.3",
"jekyll-theme-time-machine" => "0.0.3"
}.freeze
end
end
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 = 107
VERSION = 111
.to_s + '-siteleaf'.freeze
end

0 comments on commit 39298a2

Please sign in to comment.