From ee92b82c01c04f024ee48805f1e4c7143d12f76d Mon Sep 17 00:00:00 2001 From: vonavi Date: Mon, 30 Jun 2014 22:12:42 +0300 Subject: [PATCH] Upgrade Jekyll up to v2.1.0. --- .openshift/markers/force_clean_build | 0 Gemfile | 4 +- Gemfile.lock | 120 ++++++++++++++++----------- 3 files changed, 74 insertions(+), 50 deletions(-) create mode 100644 .openshift/markers/force_clean_build diff --git a/.openshift/markers/force_clean_build b/.openshift/markers/force_clean_build new file mode 100644 index 0000000..e69de29 diff --git a/Gemfile b/Gemfile index 62f4f2e..9e38fbd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'jekyll', '~> 1.4.3' +gem 'jekyll', '~> 2.1.0' gem 'kramdown' -gem 'pygments.rb', '~> 0.5.4' +gem 'pygments.rb' gem 'jekyll-assets' gem 'less' gem 'therubyracer' diff --git a/Gemfile.lock b/Gemfile.lock index 63a5794..4ecd10d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,90 +2,114 @@ GEM remote: https://rubygems.org/ specs: blankslate (2.1.2.4) + celluloid (0.15.2) + timers (~> 1.1.0) classifier (1.3.4) fast-stemmer (>= 1.0.0) coderay (1.1.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.7.0) colorator (0.1) - commander (4.1.6) - highline (~> 1.6.11) commonjs (0.2.7) - em-websocket (0.5.0) + em-websocket (0.5.1) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.5.3) + http_parser.rb (~> 0.6.0) eventmachine (1.0.3) + execjs (2.2.1) fast-stemmer (1.0.2) ffi (1.9.3) - formatador (0.2.4) - guard (1.8.3) + formatador (0.2.5) + guard (2.6.1) formatador (>= 0.2.4) - listen (~> 1.3) - lumberjack (>= 1.0.2) - pry (>= 0.9.10) - thor (>= 0.14.6) - guard-livereload (1.4.0) - em-websocket (>= 0.5.0) - guard (>= 1.8.0) - multi_json (~> 1.7) - highline (1.6.20) + listen (~> 2.7) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-livereload (2.3.0) + em-websocket (~> 0.5) + guard (~> 2.0) + multi_json (~> 1.8) hike (1.2.3) - http_parser.rb (0.5.3) - jekyll (1.4.3) + http_parser.rb (0.6.0) + jekyll (2.1.0) classifier (~> 1.3) colorator (~> 0.1) - commander (~> 4.1.3) - liquid (~> 2.5.5) - listen (~> 1.3) - maruku (~> 0.7.0) - pygments.rb (~> 0.5.0) - redcarpet (~> 2.3.0) - safe_yaml (~> 0.9.7) + 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.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) toml (~> 0.1.0) - jekyll-assets (0.7.5) - jekyll (~> 1.0) + jekyll-assets (0.8.0) + jekyll (>= 1.0.0, < 3.0.0) + sass sprockets (~> 2.10) - kramdown (1.3.3) - less (2.5.0) + sprockets-helpers + sprockets-sass + jekyll-coffeescript (1.0.0) + coffee-script (~> 2.2) + jekyll-gist (1.1.0) + jekyll-paginate (1.0.0) + jekyll-sass-converter (1.0.0) + sass (~> 3.2) + jekyll-watch (1.0.0) + listen (~> 2.7) + kramdown (1.4.0) + less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.3) - liquid (2.5.5) - listen (1.3.1) + liquid (2.6.1) + listen (2.7.9) + celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - lumberjack (1.0.4) - maruku (0.7.1) + lumberjack (1.0.9) + mercenary (0.3.3) method_source (0.8.2) - multi_json (1.8.4) + multi_json (1.10.1) parslet (1.5.0) blankslate (~> 2.0) posix-spawn (0.3.8) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - pygments.rb (0.5.4) + pygments.rb (0.6.0) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) rack (1.5.2) rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.5) ffi (>= 0.5.0) - rb-kqueue (0.2.0) - ffi (>= 0.5.0) - redcarpet (2.3.0) + redcarpet (3.1.2) ref (1.0.5) - safe_yaml (0.9.7) - slop (3.4.7) - sprockets (2.10.1) + safe_yaml (1.0.3) + sass (3.3.9) + slop (3.5.0) + sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-helpers (1.1.0) + sprockets (~> 2.0) + sprockets-sass (1.1.0) + sprockets (~> 2.0) + tilt (~> 1.1) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.18.1) + thor (0.19.1) tilt (1.4.1) + timers (1.1.0) toml (0.1.1) parslet (~> 1.5.0) yajl-ruby (1.1.0) @@ -96,10 +120,10 @@ PLATFORMS DEPENDENCIES guard-livereload - jekyll (~> 1.4.3) + jekyll (~> 2.1.0) jekyll-assets kramdown less - pygments.rb (~> 0.5.4) + pygments.rb therubyracer yui-compressor