From 1adc81748e1e97e51c5954e7eff2150790ee8660 Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 19 Jun 2017 10:29:11 -0500 Subject: [PATCH 01/21] Bump jekyll :gem: to v3.4.4 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 7c8c147b..c7def42e 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.4.3", + "jekyll" => "3.4.4", "jekyll-sass-converter" => "1.5.0", # Converters From b26bfe9d80901847f1d2acff749e0a50ed72284b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 20 Jun 2017 10:32:36 -0400 Subject: [PATCH 02/21] Upgrade liquid to v4.0.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index c7def42e..3d5aa4ef 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies "kramdown" => "1.13.2", # Misc - "liquid" => "3.0.6", + "liquid" => "4.0.0", "rouge" => "1.11.1", "github-pages-health-check" => "1.3.4", From 08999132ea1f606774ecca37cf5519adfed7250d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 20 Jun 2017 10:43:52 -0400 Subject: [PATCH 03/21] whoops no v4.0.0 here http://gifs.parkermoo.re/sad/sadface.gif --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 3d5aa4ef..c7def42e 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies "kramdown" => "1.13.2", # Misc - "liquid" => "4.0.0", + "liquid" => "3.0.6", "rouge" => "1.11.1", "github-pages-health-check" => "1.3.4", From e14529e6af97729eadbad6822c2783c04235baf5 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 30 Jun 2017 22:53:00 -0400 Subject: [PATCH 04/21] Update to v3.4.5 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index f0a65c79..3d816629 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.4.4", + "jekyll" => "3.4.5", "jekyll-sass-converter" => "1.5.0", # Converters From 28d0cef0f1cc156091b58cea17b670693b58cd54 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 10 Jul 2017 18:24:22 -0400 Subject: [PATCH 05/21] Bump :gem: to v142 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 87c1b3af..e86beadc 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 141 + VERSION = 142 end From 78476e36dff2bd71e013a8e612320ebc7b0ec0dc Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 17 Jul 2017 12:00:17 -0400 Subject: [PATCH 06/21] bump primer to 0.3.0 --- lib/github-pages/plugins.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/plugins.rb b/lib/github-pages/plugins.rb index fd6a95ee..2d745d0b 100644 --- a/lib/github-pages/plugins.rb +++ b/lib/github-pages/plugins.rb @@ -46,7 +46,7 @@ class Plugins THEMES = { "minima" => "2.1.1", "jekyll-swiss" => "0.4.0", - "jekyll-theme-primer" => "0.2.1", + "jekyll-theme-primer" => "0.3.0", "jekyll-theme-architect" => "0.0.4", "jekyll-theme-cayman" => "0.0.4", "jekyll-theme-dinky" => "0.0.4", From cdea61b795bf0c3f2c9f58eff5224246e3206c01 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 17 Jul 2017 12:03:13 -0400 Subject: [PATCH 07/21] Bump :gem: to v143 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index e86beadc..0f236d58 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 142 + VERSION = 143 end From 1f9a1f42eeb044cd375999dafdf954369b7363c5 Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 17 Jul 2017 12:24:39 -0500 Subject: [PATCH 08/21] Bump jekyll-optional-front-matter :gem: to v0.2.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 3d816629..ceb5bd44 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -33,7 +33,7 @@ class Dependencies "jemoji" => "0.8.0", "jekyll-mentions" => "1.2.0", "jekyll-relative-links" => "0.4.1", - "jekyll-optional-front-matter" => "0.1.2", + "jekyll-optional-front-matter" => "0.2.0", "jekyll-readme-index" => "0.1.0", "jekyll-default-layout" => "0.1.4", "jekyll-titles-from-headings" => "0.2.0", From 54794b2bcd58d828c7eb812c80ff47b639801669 Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 17 Jul 2017 12:27:51 -0500 Subject: [PATCH 09/21] Bump jekyll-github-metadata :gem: to v2.5.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 3d816629..bcf6e3fd 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -26,7 +26,7 @@ class Dependencies "jekyll-paginate" => "1.1.0", "jekyll-coffeescript" => "1.0.1", "jekyll-seo-tag" => "2.2.3", - "jekyll-github-metadata" => "2.4.0", + "jekyll-github-metadata" => "2.5.0", "jekyll-avatar" => "0.4.2", # Plugins to match GitHub.com Markdown From 8342231a56aae0cf0b3fe71db3677b016fb58ff0 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 17 Jul 2017 14:36:45 -0400 Subject: [PATCH 10/21] default sass to compressed in production --- lib/github-pages/configuration.rb | 18 ++++++++++++------ spec/github-pages/configuration_spec.rb | 13 +++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb index ddcd0668..79c86526 100644 --- a/lib/github-pages/configuration.rb +++ b/lib/github-pages/configuration.rb @@ -24,11 +24,12 @@ class Configuration }, }.freeze - # Jekyll defaults merged with Pages defaults. - MERGED_DEFAULTS = Jekyll::Utils.deep_merge_hashes( - Jekyll::Configuration::DEFAULTS, - DEFAULTS - ).freeze + # User-overwritable defaults used only in production for practical reasons + PRODUCTION_DEFAULTS = Jekyll::Utils.deep_merge_hashes DEFAULTS, { + "sass" => { + "style" => "compressed", + }, + }.freeze # Options which GitHub Pages sets, regardless of the user-specified value # @@ -82,6 +83,11 @@ def development? Jekyll.env == "development" end + def merged_defaults + defaults = development? ? DEFAULTS : PRODUCTION_DEFAULTS + Jekyll::Utils.deep_merge_hashes Jekyll::Configuration::DEFAULTS, defaults + end + # Given a user's config, determines the effective configuration by building a user # configuration sandwhich with our overrides overriding the user's specified # values which themselves override our defaults. @@ -91,7 +97,7 @@ def development? # Note: this is a highly modified version of Jekyll#configuration def effective_config(user_config) # Merge user config into defaults - config = Jekyll::Utils.deep_merge_hashes(MERGED_DEFAULTS, user_config) + config = Jekyll::Utils.deep_merge_hashes(merged_defaults, user_config) .fix_common_issues .add_default_collections diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb index 060a7319..9218f170 100644 --- a/spec/github-pages/configuration_spec.rb +++ b/spec/github-pages/configuration_spec.rb @@ -55,6 +55,14 @@ it "accepts local configs" do expect(effective_config["testing"]).to eql("123") end + + context "in development" do + before { ENV["JEKYLL_ENV"] = "development" } + + it "doesn't compress sass" do + expect(effective_config["sass"]).to be_nil + end + end end context "#set being called via the hook" do @@ -159,6 +167,11 @@ expect(described_class.disable_whitelist?).to eql(false) end end + + it "compresses sass" do + puts ENV["JEKYLL_ENV"].inspect + expect(effective_config["sass"]).to eql("style" => "compressed") + end end end end From 334f3849973107399150be2b2f2a49eed44d7185 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 17 Jul 2017 15:25:22 -0400 Subject: [PATCH 11/21] remove debug cruft --- spec/github-pages/configuration_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb index 9218f170..5b3a2f67 100644 --- a/spec/github-pages/configuration_spec.rb +++ b/spec/github-pages/configuration_spec.rb @@ -169,7 +169,6 @@ end it "compresses sass" do - puts ENV["JEKYLL_ENV"].inspect expect(effective_config["sass"]).to eql("style" => "compressed") end end From 1e88e4bd0b3b988a8b24a0f02dfe7e6a2862b94f Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 17 Jul 2017 15:26:40 -0500 Subject: [PATCH 12/21] Bump github-pages-health-check :gem: to v1.3.5 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 3d816629..411e1c23 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -16,7 +16,7 @@ class Dependencies # Misc "liquid" => "3.0.6", "rouge" => "1.11.1", - "github-pages-health-check" => "1.3.4", + "github-pages-health-check" => "1.3.5", # Plugins "jekyll-redirect-from" => "0.12.1", From 84680c518e227054a725fc8d41a2c94e75af032f Mon Sep 17 00:00:00 2001 From: Ben Balter <282759+benbalter@users.noreply.github.com> Date: Mon, 17 Jul 2017 18:18:50 -0400 Subject: [PATCH 13/21] bump metadata to 2.5.1 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index bcf6e3fd..827a78da 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -26,7 +26,7 @@ class Dependencies "jekyll-paginate" => "1.1.0", "jekyll-coffeescript" => "1.0.1", "jekyll-seo-tag" => "2.2.3", - "jekyll-github-metadata" => "2.5.0", + "jekyll-github-metadata" => "2.5.1", "jekyll-avatar" => "0.4.2", # Plugins to match GitHub.com Markdown From e2f84a233f53b33859e0d632651d6c73763ec60c Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 18 Jul 2017 10:23:37 -0400 Subject: [PATCH 14/21] Bump :gem: to v144 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 0f236d58..8501fe33 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 143 + VERSION = 144 end From 71c6c22fd1438274dbbac95ea3d9051b8e59d6b9 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 18 Jul 2017 13:55:36 -0400 Subject: [PATCH 15/21] bump primer to v0.3.1 --- lib/github-pages/plugins.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/plugins.rb b/lib/github-pages/plugins.rb index 2d745d0b..21b4daeb 100644 --- a/lib/github-pages/plugins.rb +++ b/lib/github-pages/plugins.rb @@ -46,7 +46,7 @@ class Plugins THEMES = { "minima" => "2.1.1", "jekyll-swiss" => "0.4.0", - "jekyll-theme-primer" => "0.3.0", + "jekyll-theme-primer" => "0.3.1", "jekyll-theme-architect" => "0.0.4", "jekyll-theme-cayman" => "0.0.4", "jekyll-theme-dinky" => "0.0.4", From 3b92986282de00548621d10ecfc08f7f5246f2d8 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 18 Jul 2017 15:55:13 -0400 Subject: [PATCH 16/21] Bump :gem: to v145 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 8501fe33..aae8b368 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 144 + VERSION = 145 end From b4aab60b5f075f80c3bd869c087807c4f81205f2 Mon Sep 17 00:00:00 2001 From: M Somerville Date: Tue, 18 Jul 2017 22:11:16 +0100 Subject: [PATCH 17/21] Fix CONTRIBUTING links in issue template The file was moved under `.github` last month. --- .github/ISSUE_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4607af1d..39a6ffa3 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,6 +1,6 @@ ### Before submitting an issue, please be sure to -- [ ] Read [the contributing instructions](https://github.com/github/pages-gem/blob/master/CONTRIBUTING.md#contributing-to-the-github-pages-gem) +- [ ] Read [the contributing instructions](https://github.com/github/pages-gem/blob/master/.github/CONTRIBUTING.md#contributing-to-the-github-pages-gem) - [ ] Update to the latest Gem version (run `bundle update github-pages`) ### This issue affects @@ -8,7 +8,7 @@ - [ ] The site generated by GitHub Pages - [ ] Building sites locally -*The GitHub Pages Gem is intended to help users replicate the GitHub Pages build environment locally. If your issue affects both the hosted version and the version previewed locally, you may be better suited reporting [seeking support in other forums](https://github.com/github/pages-gem/blob/master/CONTRIBUTING.md#where-to-get-help-or-report-an-issue).* +*The GitHub Pages Gem is intended to help users replicate the GitHub Pages build environment locally. If your issue affects both the hosted version and the version previewed locally, you may be better suited reporting [seeking support in other forums](https://github.com/github/pages-gem/blob/master/.github/CONTRIBUTING.md#where-to-get-help-or-report-an-issue).* ### What did you do (e.g., steps to reproduce) From 9d4f041c384899d441f6611904cca6458a5c4092 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 18 Jul 2017 17:20:14 -0400 Subject: [PATCH 18/21] add SUPPORT.md --- .github/CONTRIBUTING.md | 20 +------------------- .github/SUPPORT.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 .github/SUPPORT.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 71c243a7..f12914bf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,25 +4,7 @@ Hi there! We're glad you're interested in contributing to the GitHub Pages Gem. ## Where to get help or report an issue -### Bugs - -* If your think you may have found a bug in a particular theme or plugin, please open an issue against that project's repository directly. - -* If your think you may have found a bug in Jekyll itself, please [open an issue in the Jekyll repository](https://github.com/jekyll/jekyll/issues/new). - -* If you think you may have found a bug with how the GitHub Pages Gem bootstraps your local development environment, please [open an issue in this repository](https://github.com/github/pages-gem/issues/new). - -### Questions - -If you have a general question about Jekyll or GitHub Pages (e.g., a configuration question, a question specific to your site, upgrading, etc.) you have two options: - -1. [Contact GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages), or - -2. Ask your question of the Jekyll community on [talk.jekyllrb.com](https://talk.jekyllrb.com/) - -### Feature requests - -General GitHub Pages feature requests, including requests to add additional plugins or themes should be made via [GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages%20Feature%20Request). +See [the support guidelines](SUPPORT.md) ## Contributing diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md new file mode 100644 index 00000000..cc3db37a --- /dev/null +++ b/.github/SUPPORT.md @@ -0,0 +1,21 @@ +## Where to get help or report an issue + +### Bugs + +* If your think you may have found a bug in a particular theme or plugin, please open an issue against that project's repository directly. + +* If your think you may have found a bug in Jekyll itself, please [open an issue in the Jekyll repository](https://github.com/jekyll/jekyll/issues/new). + +* If you think you may have found a bug with how the GitHub Pages Gem bootstraps your local development environment, please [open an issue in this repository](https://github.com/github/pages-gem/issues/new). + +### Questions + +If you have a general question about Jekyll or GitHub Pages (e.g., a configuration question, a question specific to your site, upgrading, etc.) you have two options: + +1. [Contact GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages), or + +2. Ask your question of the Jekyll community on [talk.jekyllrb.com](https://talk.jekyllrb.com/) + +### Feature requests + +General GitHub Pages feature requests, including requests to add additional plugins or themes should be made via [GitHub Support](https://github.com/contact?form%5Bsubject%5D=GitHub%20Pages%20Feature%20Request). From 2339417cc1dce671b35f2c091feac0e97f8bd127 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 09:30:13 -0400 Subject: [PATCH 19/21] rename merged_defaults to defaults_for_env --- lib/github-pages/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb index 79c86526..fa38a159 100644 --- a/lib/github-pages/configuration.rb +++ b/lib/github-pages/configuration.rb @@ -83,7 +83,7 @@ def development? Jekyll.env == "development" end - def merged_defaults + def defaults_for_env defaults = development? ? DEFAULTS : PRODUCTION_DEFAULTS Jekyll::Utils.deep_merge_hashes Jekyll::Configuration::DEFAULTS, defaults end @@ -97,7 +97,7 @@ def merged_defaults # Note: this is a highly modified version of Jekyll#configuration def effective_config(user_config) # Merge user config into defaults - config = Jekyll::Utils.deep_merge_hashes(merged_defaults, user_config) + config = Jekyll::Utils.deep_merge_hashes(defaults_for_env, user_config) .fix_common_issues .add_default_collections From 5e056cf2de25669156a41f64655cf4ccfecba17c Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 09:30:20 -0400 Subject: [PATCH 20/21] add tests for defaults_for_env --- spec/github-pages/configuration_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb index 5b3a2f67..72c9dcdc 100644 --- a/spec/github-pages/configuration_spec.rb +++ b/spec/github-pages/configuration_spec.rb @@ -14,6 +14,8 @@ let(:configuration) { Jekyll.configuration(test_config) } let(:site) { Jekyll::Site.new(configuration) } let(:effective_config) { described_class.effective_config(site.config) } + let(:defaults_for_env) { described_class.defaults_for_env } + before(:each) do ENV.delete("DISABLE_WHITELIST") ENV["JEKYLL_ENV"] = "test" @@ -61,6 +63,7 @@ it "doesn't compress sass" do expect(effective_config["sass"]).to be_nil + expect(defaults_for_env["sass"]).to be_nil end end end @@ -170,6 +173,7 @@ it "compresses sass" do expect(effective_config["sass"]).to eql("style" => "compressed") + expect(defaults_for_env["sass"]).to eql("style" => "compressed") end end end From 9ae72e787b07975a358988b24b8f2e29823cd84f Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 13:06:03 -0400 Subject: [PATCH 21/21] Bump :gem: to v146 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index aae8b368..bbb9ee27 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 145 + VERSION = 146 end