From c9b2ba9b2f1c08bb4644bb66485afbbe3e3c6853 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 12 Oct 2014 18:05:19 +0200 Subject: [PATCH] Update jekyll version --- Gemfile | 6 +++--- Gemfile.lock | 42 ++++++++++++++++++++++-------------------- Makefile | 4 ++-- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index 5667a28..a1457eb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' ruby '2.1.2' -gem 'jekyll', '~> 2.3.0' -gem 'jekyll-assets', '~> 0.9.2' +gem 'jekyll', '~> 2.4.0' +gem 'jekyll-assets', '~> 0.10.0' -gem 'kramdown', '~> 1.4.1' +gem 'kramdown', '~> 1.4.2' gem 'therubyracer', '~> 0.12.1' gem 'less', '~> 2.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 71ae7f2..c297e45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,21 +2,22 @@ GEM remote: https://rubygems.org/ specs: blankslate (2.1.2.4) - celluloid (0.15.2) - timers (~> 1.1.0) - classifier-reborn (2.0.0) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.1) fast-stemmer (~> 1.0) coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.1) + coffee-script-source (1.8.0) colorator (0.1) commonjs (0.2.7) execjs (2.2.1) fast-stemmer (1.0.2) - ffi (1.9.3) + ffi (1.9.6) hike (1.2.3) - jekyll (2.3.0) + hitimes (1.2.2) + jekyll (2.4.0) classifier-reborn (~> 2.0) colorator (~> 0.1) jekyll-coffeescript (~> 1.0) @@ -31,27 +32,27 @@ GEM redcarpet (~> 3.1) safe_yaml (~> 1.0) toml (~> 0.1.0) - jekyll-assets (0.9.2) - jekyll (>= 1.0.0, < 3.0.0) + jekyll-assets (0.10.0) + jekyll (~> 2.0) sass (~> 3.2) sprockets (~> 2.10) sprockets-helpers sprockets-sass - jekyll-coffeescript (1.0.0) + jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) jekyll-gist (1.1.0) jekyll-paginate (1.0.0) - jekyll-sass-converter (1.2.0) + jekyll-sass-converter (1.2.1) sass (~> 3.2) - jekyll-watch (1.1.0) + jekyll-watch (1.1.1) listen (~> 2.7) json (1.8.1) - kramdown (1.4.1) + kramdown (1.4.2) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.3) liquid (2.6.1) - listen (2.7.9) + listen (2.7.11) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -69,9 +70,9 @@ GEM ffi (>= 0.5.0) redcarpet (3.1.2) ref (1.0.5) - safe_yaml (1.0.3) - sass (3.3.14) - sprockets (2.12.1) + safe_yaml (1.0.4) + sass (3.4.5) + sprockets (2.12.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -85,7 +86,8 @@ GEM libv8 (~> 3.16.14.0) ref tilt (1.4.1) - timers (1.1.0) + timers (4.0.1) + hitimes toml (0.1.1) parslet (~> 1.5.0) uglifier (2.5.3) @@ -98,9 +100,9 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 2.3.0) - jekyll-assets (~> 0.9.2) - kramdown (~> 1.4.1) + jekyll (~> 2.4.0) + jekyll-assets (~> 0.10.0) + kramdown (~> 1.4.2) less (~> 2.6.0) therubyracer (~> 0.12.1) uglifier (~> 2.5.3) diff --git a/Makefile b/Makefile index 3134e6a..92f075b 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,6 @@ compile: upload: @echo "=== Syncing files" - @rsync -avz --no-o --no-g -e ssh --chmod=og=r -p --delete _site/ kempkens:/var/www/blog + @rsync -avz --no-o --no-g -e ssh --chmod=og=r -p --delete _site/ kempkens.io:/var/www/blog @echo "=== Changing permissions" - @ssh kempkens chown -R www-data:www-data /var/www/blog + @ssh kempkens.io chown -R www-data:www-data /var/www/blog