dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jekyll/jekyll 

* 'master' of github.com:jekyll/jekyll:
  Make our .travis.yml a little easier to maintain.
  Update History.markdown to reflect the merger of #4394
  Minor spelling error
This commit is contained in:
Parker Moore 2016-01-24 13:13:21 -08:00
parent 368f5b67a9 c5818d1837
commit 55910f19c3
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -1,23 +1,23 @@
bundler_args: --without benchmark:site:development
before_script: bundle update before_script: bundle update
bundler_args: --without benchmark:site:development
script: script/cibuild script: script/cibuild
cache: bundler cache: bundler
language: ruby language: ruby
sudo: false sudo: false
rvm: rvm:
- 2.0.0-p648 - &ruby1 2.3.0
- 2.1.8 - &ruby2 2.2.4
- 2.2.4 - &ruby3 2.1.8
- 2.3.0 - &ruby4 2.0.0-p648
- jruby-9.0.4.0 - &jruby jruby-9.0.4.0
- ruby-head - &rhead ruby-head
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- rvm: jruby-9.0.4.0 - rvm: *jruby
- rvm: ruby-head - rvm: *rhead
env: env:
matrix: matrix:
- TEST_SUITE=test - TEST_SUITE=test

1
History.markdown
View File

@ -92,6 +92,7 @@
* Add @jmcglone's guide to github-pages doc page (#4364) * Add @jmcglone's guide to github-pages doc page (#4364)
* Added the Wordpress2Jekyll Wordpress plugin (#4377) * Added the Wordpress2Jekyll Wordpress plugin (#4377)
* Add Contentful Extension to list of third-party plugins (#4390) * Add Contentful Extension to list of third-party plugins (#4390)
* Correct Minor spelling error (#4394)
## 3.0.2 / 2016-01-20 ## 3.0.2 / 2016-01-20

2
site/_docs/plugins.md
View File

@ -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. - [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. - [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. - [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. - [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. - [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. - [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build.