Merge pull request #2230 from 18F/dev

Dev --> master

Author: Corey Mahoney

.bundle/config

@@ -1,2 +1,3 @@
 ---
 BUNDLE_BIN: "bin"
+BUNDLE_GITHUB__HTTPS: "true"

.pa11yci

@@ -1,28 +1,23 @@
 source 'https://rubygems.org'
 
 ruby '2.3.1'
-gem 'redcarpet'
-gem 'jekyll', '~> 3.1'
-gem 'html-proofer'
+
 gem 'accesslint-ci', '0.2.6'
+gem 'html-proofer'
+gem 'jekyll', '~> 3.3.0'
+gem 'jemoji'
 
 group :jekyll_plugins do
-  if ENV['FAST_BUILDS'] == 'true'
-    puts 'not using jekyll-archives because its sloooooooooow'
-  else
-    gem 'jekyll-archives', git: 'https://github.com/18F/jekyll-archives.git'
-  end
-
-  gem 'jekyll_pages_api'
-  gem 'jekyll_pages_api_search'
-  gem 'jekyll-sitemap'
+  gem 'jekyll-archives', git: 'git://github.com/jekyll/jekyll-archives.git', ref: '112c508'
+  gem 'jekyll-feed'
   gem 'jekyll-paginate'
   gem 'jekyll-redirect-from'
-  gem 'jekyll_frontmatter_tests'
-  gem 'jekyll-feed'
   gem 'jekyll-seo-tag'
+  gem 'jekyll-sitemap'
+  gem 'jekyll_frontmatter_tests'
+  gem 'jekyll_pages_api'
+  gem 'jekyll_pages_api_search'
 end
-gem 'jemoji'
 
 group :development do
   gem 'capybara'
@@ -36,6 +31,6 @@ group :development do
 end
 
 group :test do
-  gem 'simplecov'
   gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'simplecov'
 end

.python-version

@@ -1,6 +1,7 @@
 GIT
-  remote: https://github.com/18F/jekyll-archives.git
-  revision: 9ad78a4aa38de0af570a53f3c12558408e9537f7
+  remote: git://github.com/jekyll/jekyll-archives.git
+  revision: 112c508031acf3cf1d9024b005f99b2752133769
+  ref: 112c508
   specs:
     jekyll-archives (2.1.0)
       jekyll (>= 2.4)
@@ -17,7 +18,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
     capybara (2.11.0)
@@ -32,25 +34,25 @@ GEM
     chromedriver-helper (1.0.0)
       archive-zip (~> 0.7.0)
       nokogiri (~> 1.6)
-    codeclimate-test-reporter (1.0.4)
+    codeclimate-test-reporter (1.0.5)
       simplecov
     coderay (1.1.1)
     colorator (1.1.0)
     colored (1.2)
     colorize (0.8.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
-    ethon (0.9.1)
+    ethon (0.10.1)
       ffi (>= 1.3.0)
-    ffi (1.9.14)
+    ffi (1.9.17)
     forwardable-extended (2.6.0)
     gemoji (2.1.0)
-    html-pipeline (2.4.2)
+    html-pipeline (2.5.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html-proofer (3.2.0)
+    html-proofer (3.4.0)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
       colored (~> 1.2)
@@ -64,7 +66,7 @@ GEM
       domain_name (~> 0.5)
     i18n (0.7.0)
     io-like (0.3.0)
-    jekyll (3.3.0)
+    jekyll (3.3.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -78,17 +80,17 @@ GEM
     jekyll-feed (0.8.0)
       jekyll (~> 3.3)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.4.0)
+    jekyll-redirect-from (0.12.1)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-seo-tag (2.0.0)
-      jekyll (~> 3.1)
-    jekyll-sitemap (0.12.0)
+    jekyll-seo-tag (2.1.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.0.0)
       jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jekyll_frontmatter_tests (0.0.8)
+    jekyll_frontmatter_tests (0.0.13)
       jekyll (>= 2.0, < 4.0)
     jekyll_pages_api (0.1.6)
       htmlentities (~> 4.3)
@@ -101,8 +103,8 @@ GEM
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
-    json (1.8.3)
-    kramdown (1.12.0)
+    json (1.8.6)
+    kramdown (1.13.2)
     liquid (3.0.6)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -113,29 +115,29 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     netrc (0.11.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    parallel (1.9.0)
+    parallel (1.10.0)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.5)
     rack (1.6.5)
     rack-jekyll (0.5.0)
       jekyll (>= 1.3)
       listen (>= 1.3)
       rack (~> 1.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rb-readline (0.5.3)
-    redcarpet (3.3.4)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -156,7 +158,7 @@ GEM
     rspec-support (3.5.0)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
-    sass (3.4.22)
+    sass (3.4.23)
     selenium-webdriver (3.0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
@@ -179,7 +181,7 @@ GEM
     websocket (1.2.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yell (2.0.6)
+    yell (2.0.7)
 
 PLATFORMS
   ruby
@@ -191,7 +193,7 @@ DEPENDENCIES
   codeclimate-test-reporter (~> 1.0.0)
   colorize
   html-proofer
-  jekyll (~> 3.1)
+  jekyll (~> 3.3.0)
   jekyll-archives!
   jekyll-feed
   jekyll-paginate
@@ -205,7 +207,6 @@ DEPENDENCIES
   pry
   rack-jekyll
   rb-readline
-  redcarpet
   rspec
   selenium-webdriver
   simplecov

.travis.yml

@@ -17,9 +17,10 @@ Run each of the following steps to get the site up and running.
 3. `bundle install`
 4. `./serve`
 
-To enable the ability to search and see all pages related to the blog, you can run `bundle exec jekyll serve` instead of `./serve` for the server start command. This will **slow down rebuild times dramatically**, so use this command with discretion.
+To dramatically reduce the build time, there are two commands that you can run instead of `./serve`:
 
-To enable the ability to see the most recent posts, you can run `./serve-blog`. This takes longer than `./serve`, but **significantly less time** than building the entire site.
+* `./serve-fast`: This will eliminate all of the blog posts and the search index, but generates all other pages
+* `./serve-blog`: This will eliminate all but the latest three blog posts, but keeps the rest of the site intact.
 
 You should be able to see the site at: http://127.0.0.1:4000
 

Gemfile

@@ -3,11 +3,6 @@ name: 18F
 first_name: 18F
 last_name: 
 full_name: 18F
-role: Organization
-city: 
-state: 
-github: 18F
-twitter: 18F
 redirect_from: "/team/18F/"
 published: true
 ---

Gemfile.lock

@@ -3,11 +3,6 @@ name: aaron
 first_name: Aaron
 last_name: Snow
 full_name: Aaron Snow
-role: Executive Director
-city: Washington
-state: D.C.
-github: 
-twitter: 
 redirect_from: "/team/aaron/"
 alumni: true
 published: true

README.md

@@ -3,9 +3,6 @@ first_name: Ada
 last_name: Lovelace
 full_name: Ada Lovelace
 name: ada-lovelace
-role: Developer
-city: London
-state: UK
 april-fools: 2016
 tags: april fools 2016
 redirect_to: "/april-fools/2016/"