diff --git a/.bundle/config b/.bundle/config index 57d4641d13..00ae63b7cf 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,3 +1,3 @@ --- BUNDLE_PATH: vendor/bundle -BUNDLE_DISABLE_SHARED_GEMS: '1' +BUNDLE_DISABLE_SHARED_GEMS: true diff --git a/Gemfile.lock b/Gemfile.lock index 0e2d017f60..fb8a6d213b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,123 +1,133 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) - activesupport (4.2.5.1) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) - colorator (0.1) - ethon (0.8.1) + colorator (1.1.0) + ethon (0.9.1) ffi (>= 1.3.0) - execjs (2.6.0) + execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.10) + ffi (1.9.14) + forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (46) - RedCloth (= 4.2.9) - github-pages-health-check (= 0.6.0) - jekyll (= 3.0.3) + github-pages (98) + activesupport (= 4.2.7) + github-pages-health-check (= 1.2.0) + jekyll (= 3.2.1) jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.3.1) + jekyll-feed (= 0.5.1) jekyll-gist (= 1.4.0) - jekyll-mentions (= 1.0.0) + jekyll-github-metadata (= 2.1.1) + jekyll-mentions (= 1.2.0) jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.9.1) + jekyll-redirect-from (= 0.11.0) jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 0.1.4) + jekyll-seo-tag (= 2.0.0) jekyll-sitemap (= 0.10.0) - jekyll-textile-converter (= 0.1.0) - jemoji (= 0.5.1) - kramdown (= 1.9.0) + jekyll-swiss (= 0.4.0) + jemoji (= 0.7.0) + kramdown (= 1.11.1) liquid (= 3.0.6) + listen (= 3.0.6) mercenary (~> 0.3) - rdiscount (= 2.1.8) - redcarpet (= 3.3.3) - rouge (= 1.10.1) + minima (= 1.2.0) + rouge (= 1.11.1) terminal-table (~> 1.4) - github-pages-health-check (0.6.0) + github-pages-health-check (1.2.0) addressable (~> 2.3) net-dns (~> 0.8) + octokit (~> 4.0) public_suffix (~> 1.4) typhoeus (~> 0.7) - html-pipeline (2.3.0) - activesupport (>= 2, < 5) + html-pipeline (2.4.2) + activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.0.3) - colorator (~> 0.1) + jekyll (3.2.1) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) + pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-feed (0.3.1) + jekyll-feed (0.5.1) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-mentions (1.0.0) - html-pipeline (~> 2.2) + jekyll-github-metadata (2.1.1) + jekyll (~> 3.1) + octokit (~> 4.0) + jekyll-mentions (1.2.0) + activesupport (~> 4.0) + html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.9.1) + jekyll-redirect-from (0.11.0) jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-seo-tag (0.1.4) - jekyll (>= 2.0) + jekyll-seo-tag (2.0.0) + jekyll (~> 3.1) jekyll-sitemap (0.10.0) - jekyll-textile-converter (0.1.0) - RedCloth (~> 4.0) - jekyll-watch (1.3.1) - listen (~> 3.0) - jemoji (0.5.1) + jekyll-swiss (0.4.0) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + jemoji (0.7.0) + activesupport (~> 4.0) gemoji (~> 2.0) html-pipeline (~> 2.2) - jekyll (>= 2.0) + jekyll (>= 3.0) json (1.8.3) - kramdown (1.9.0) + kramdown (1.11.1) liquid (3.0.6) - listen (3.0.5) + listen (3.0.6) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.5) - mini_portile2 (2.0.0) - minitest (5.8.4) + rb-inotify (>= 0.9.7) + mercenary (0.3.6) + mini_portile2 (2.1.0) + minima (1.2.0) + minitest (5.9.1) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - octokit (4.2.0) - sawyer (~> 0.6.0, >= 0.5.3) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + pathutil (0.14.0) + forwardable-extended (~> 2.6) public_suffix (1.5.3) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - rdiscount (2.1.8) - redcarpet (3.3.3) - rouge (1.10.1) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.21) - sawyer (0.6.0) - addressable (~> 2.3.5) + sass (3.4.22) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - terminal-table (1.5.2) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) thread_safe (0.3.5) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) + unicode-display_width (1.1.1) PLATFORMS ruby @@ -126,4 +136,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.10.6 + 1.12.5