From cf086c387369c15361b0ac44741401e9728fa402 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 31 Jul 2014 08:26:41 -0400 Subject: [PATCH] Update to Jekyll 2.2.0 - Using the theme for the first time install Bundler and then run 'bundle install' - Updating the theme run 'bundle update' to update all gem dependencies --- Gemfile | 8 ++---- Gemfile.lock | 78 +++++++++++++++++++++------------------------------- _config.yml | 3 +- 3 files changed, 34 insertions(+), 55 deletions(-) diff --git a/Gemfile b/Gemfile index b78bb06..804ef1c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,5 @@ source 'https://rubygems.org' gem 'jekyll' -gem 'kramdown' -gem 'coderay' -gem 'rake' -gem 'thor' -gem 'activesupport' -gem 'stringex' \ No newline at end of file +gem "jekyll-sitemap" +gem 'octopress', '~> 3.0.0.rc.12' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 9f8f0ee..4f6937d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,92 +1,76 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.1) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) blankslate (2.1.2.4) celluloid (0.15.2) timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) classifier (1.3.4) fast-stemmer (>= 1.0.0) - coderay (1.1.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) colorator (0.1) - execjs (2.0.2) + execjs (2.2.1) fast-stemmer (1.0.2) - ffi (1.9.3) ffi (1.9.3-x86-mingw32) - i18n (0.6.9) - jekyll (2.0.2) + jekyll (2.2.0) classifier (~> 1.3) colorator (~> 0.1) jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.0) kramdown (~> 1.3) - liquid (~> 2.5.5) - listen (~> 2.5) - mercenary (~> 0.3.1) - pygments.rb (~> 0.5.0) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) redcarpet (~> 3.1) safe_yaml (~> 1.0) toml (~> 0.1.0) jekyll-coffeescript (1.0.0) coffee-script (~> 2.2) - jekyll-sass-converter (1.0.0) + jekyll-gist (1.1.0) + jekyll-paginate (1.0.0) + jekyll-sass-converter (1.1.0) sass (~> 3.2) - json (1.8.1) - kramdown (1.3.3) - liquid (2.5.5) - listen (2.7.4) + jekyll-sitemap (0.5.0) + jekyll-watch (1.0.0) + listen (~> 2.7) + kramdown (1.4.0) + liquid (2.6.1) + listen (2.7.9) celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - mercenary (0.3.3) - minitest (5.3.3) - nio4r (1.0.0) + mercenary (0.3.4) + octopress (3.0.0.rc.14) + jekyll (~> 2.0) + mercenary (~> 0.3.2) + titlecase parslet (1.5.0) blankslate (~> 2.0) posix-spawn (0.3.8) - pygments.rb (0.5.4) + pygments.rb (0.6.0) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - rake (10.3.1) rb-fsevent (0.9.4) - rb-inotify (0.9.4) + rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.1.1) + redcarpet (3.1.2) safe_yaml (1.0.3) - sass (3.3.7) - stringex (2.5.2) - thor (0.19.1) - thread_safe (0.3.3) + sass (3.3.12) timers (1.1.0) + titlecase (0.1.1) toml (0.1.1) parslet (~> 1.5.0) - tzinfo (1.1.0) - thread_safe (~> 0.1) - yajl-ruby (1.1.0) yajl-ruby (1.1.0-x86-mingw32) PLATFORMS - ruby x86-mingw32 DEPENDENCIES - activesupport - coderay jekyll - kramdown - rake - stringex - thor + jekyll-sitemap + octopress (~> 3.0.0.rc.12) diff --git a/_config.yml b/_config.yml index 697ecd5..871167c 100644 --- a/_config.yml +++ b/_config.yml @@ -48,8 +48,7 @@ links: # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones timezone: America/New_York future: true -pygments: true -#highlighter: pygments +highlighter: pygments markdown: kramdown # https://github.com/mojombo/jekyll/wiki/Permalinks -- 2.43.0