From c5abfe0dd2f2d57fdea5af2a6d6a4cb24165cb3f Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Thu, 5 Jan 2017 09:19:47 +0100 Subject: [PATCH 1/3] Upgrade Jekyll to 3.3.1 --- Gemfile | 2 +- Gemfile.lock | 96 ++++++++++++++++++---------------------------------- 2 files changed, 34 insertions(+), 64 deletions(-) diff --git a/Gemfile b/Gemfile index eb6f409fa03..641028bff85 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'jekyll', '2.4.0' +gem 'jekyll', '3.3.1' gem 'therubyracer' gem 'html-proofer' diff --git a/Gemfile.lock b/Gemfile.lock index d9dff92020d..1c0626bc3a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,24 +6,15 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.3.8) - blankslate (2.1.2.4) - classifier-reborn (2.0.4) - fast-stemmer (~> 1.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorator (0.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + colorator (1.1.0) colored (1.2) concurrent-ruby (1.0.4) ethon (0.10.1) ffi (>= 1.3.0) - execjs (2.6.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - fast-stemmer (1.0.2) - ffi (1.9.10) + ffi (1.9.14) + forwardable-extended (2.6.0) html-proofer (3.4.0) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) @@ -34,72 +25,51 @@ GEM typhoeus (~> 0.7) yell (~> 2.0) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) - colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) + jekyll (3.3.1) + addressable (~> 2.4) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + pathutil (~> 0.9) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-gist (1.4.0) - octokit (~> 4.2) - jekyll-paginate (1.1.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-watch (1.3.1) - listen (~> 3.0) - kramdown (1.9.0) - libv8 (3.16.14.11) - liquid (2.6.2) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.5) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.13.1) + libv8 (3.16.14.17) + liquid (3.0.6) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) mini_portile2 (2.1.0) minitest (5.10.1) - multipart-post (2.0.0) - nokogiri (1.7.0) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) - octokit (4.2.0) - sawyer (~> 0.6.0, >= 0.5.3) parallel (1.10.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.11) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.5) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + public_suffix (2.0.5) + rb-fsevent (0.9.8) + rb-inotify (0.9.7) ffi (>= 0.5.0) - redcarpet (3.3.3) ref (2.0.0) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.21) - sawyer (0.6.0) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + sass (3.4.23) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thread_safe (0.3.5) - toml (0.1.2) - parslet (~> 1.5.0) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - yajl-ruby (1.2.1) yell (2.0.7) PLATFORMS @@ -107,7 +77,7 @@ PLATFORMS DEPENDENCIES html-proofer - jekyll (= 2.4.0) + jekyll (= 3.3.1) therubyracer BUNDLED WITH From 6d20b2a9a7a3931d201efddbe3c1f67c3a970141 Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Thu, 5 Jan 2017 09:30:04 +0100 Subject: [PATCH 2/3] Make getting started instructions easier to follow --- README.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7d769f14990..b4e6c726c0d 100644 --- a/README.md +++ b/README.md @@ -19,18 +19,25 @@ provided by GitHub. A tldr version follows: -* First time contributor to this site? Ensure you have Ruby and bundler - installed, and then run `bundle install` -* Create a branch. -* Make your changes. -* To test your changes, run `bundle exec jekyll serve` (or - `jekyll serve -w --force_polling`) -* Prior to submitting, run automatic link validation: - - ``` - bundle exec jekyll build - bundle exec htmlproofer --empty-alt-ignore _site --url-ignore "#" - ``` +1. Ensure you have [Ruby](https://www.ruby-lang.org/en/downloads/) installed; you need version 2.3.1 or later:
+`ruby --version` + +1. Ensure you have [Bundler](http://bundler.io/) installed; if not install with:
+`sudo gem install bundler` + +1. Install all dependencies:
+`bundle install` + +1. Create a branch. + +1. Make your changes. + +1. Test your changes by serving the site locally:
+`bundle exec jekyll serve` (or `jekyll serve -w --force_polling`) + +1. Prior to submitting, run link validation:
+`bundle exec jekyll build`
+`bundle exec htmlproofer --empty-alt-ignore _site --url-ignore "#"` ## Code Snippet Validation From 262eb356feb47405ac48cf18f977e04e744af84e Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Thu, 5 Jan 2017 09:49:15 +0100 Subject: [PATCH 3/3] Change Ruby link to the Ruby installation page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4e6c726c0d..4ff52c3cc61 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ provided by GitHub. A tldr version follows: -1. Ensure you have [Ruby](https://www.ruby-lang.org/en/downloads/) installed; you need version 2.3.1 or later:
+1. Ensure you have [Ruby](https://www.ruby-lang.org/en/documentation/installation/) installed; you need version 2.3.1 or later:
`ruby --version` 1. Ensure you have [Bundler](http://bundler.io/) installed; if not install with: