From 96b80b1a727a92cef0108684f263dc94aff817a1 Mon Sep 17 00:00:00 2001 From: John Perry Date: Sat, 23 Jan 2016 23:27:17 -0700 Subject: [PATCH 1/3] Minor spelling error --- site/_docs/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 5f1ba786..4bcdd545 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -870,7 +870,7 @@ LESS.js files during generation. - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build. - [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies. - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website. -- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps. +- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps. - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll. - [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo. - [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build. From ab8f2d6bb1cd582aaeb17d073f96b43ef7c60268 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 24 Jan 2016 08:40:31 -0600 Subject: [PATCH 2/3] Update History.markdown to reflect the merger of #4394 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7f1c612d..749b0322 100644 --- a/History.markdown +++ b/History.markdown @@ -92,6 +92,7 @@ * Add @jmcglone's guide to github-pages doc page (#4364) * Added the Wordpress2Jekyll Wordpress plugin (#4377) * Add Contentful Extension to list of third-party plugins (#4390) + * Correct Minor spelling error (#4394) ## 3.0.2 / 2016-01-20 From c5818d18374b0b34d26a36013b964a5c64603ff5 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 24 Jan 2016 09:50:02 -0600 Subject: [PATCH 3/3] Make our .travis.yml a little easier to maintain. --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29b0a836..5c6e5855 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ -bundler_args: --without benchmark:site:development before_script: bundle update +bundler_args: --without benchmark:site:development script: script/cibuild cache: bundler language: ruby sudo: false rvm: -- 2.0.0-p648 -- 2.1.8 -- 2.2.4 -- 2.3.0 -- jruby-9.0.4.0 -- ruby-head + - &ruby1 2.3.0 + - &ruby2 2.2.4 + - &ruby3 2.1.8 + - &ruby4 2.0.0-p648 + - &jruby jruby-9.0.4.0 + - &rhead ruby-head matrix: fast_finish: true allow_failures: - - rvm: jruby-9.0.4.0 - - rvm: ruby-head + - rvm: *jruby + - rvm: *rhead env: matrix: - - TEST_SUITE=test - - TEST_SUITE=cucumber + - TEST_SUITE=test + - TEST_SUITE=cucumber branches: only: - - master + - master notifications: irc: