Merge branch 'master' of https://github.com/jekyll/jekyll-archives into page

Author: alfredxing

.travis.yml

@@ -3,12 +3,12 @@ script : script/cibuild
 sudo: false
 
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0
+  - 2.3.1
+  - 2.2.5
+  - 2.1.9
 env:
   - ""
-  - JEKYLL_VERSION=3.0.0
+  - JEKYLL_VERSION=3.0
   - JEKYLL_VERSION=2.0
 matrix:
   include:

Gemfile

@@ -6,3 +6,6 @@ if ENV["GH_PAGES"]
 elsif ENV["JEKYLL_VERSION"]
   gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
 end
+
+# Support for Ruby < 2.2.2 & activesupport
+gem "activesupport", "~> 4.2" if RUBY_VERSION < '2.2.2'

History.md

@@ -3,6 +3,9 @@
 ### Minor Enhancements
   * Don't limit slugs/title to strings (#41)
 
+### Development Fixes
+  * Update Travis config and Gemfile for Ruby < 2.2.2 support (#68)
+
 ## 2.1.0 
 
 ### Minor Enhancements
@@ -12,7 +15,7 @@
   * Update to reflect release of Jekyll 3 (#52)
   * Support revised documents/collections in Jekyll 3 (#53)
 
-## Development Fixes
+### Development Fixes
   * Test against Jekyll 2, 3, and GitHub Pages (#48)
 
 ### Bug Fixes