From a025789d75016a3e8576604f416c5b71e166ca3d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 4 Oct 2017 20:27:36 +0200 Subject: Upgrade to newest version of Jekyll. Also add sone development dependencies for better debugging. --- Gemfile | 2 ++ Gemfile.lock | 65 ++++++++++++++++++++++++++++++++++---------------------- blog/_config.yml | 9 +++----- 3 files changed, 45 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index f12ca85..7768de1 100644 --- a/Gemfile +++ b/Gemfile @@ -10,3 +10,5 @@ end # Other useful gems gem 'facets', :require => false gem 'mini_magick', :require => false +gem 'pry-byebug' +gem 'byebug' diff --git a/Gemfile.lock b/Gemfile.lock index d4d2196..8652dc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,58 +1,72 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + byebug (9.1.0) + coderay (1.1.1) colorator (1.1.0) - concurrent-ruby (1.0.4) - extras (0.1.0) + concurrent-ruby (1.0.5) + extras (0.3.0) forwardable-extended (~> 2.5) facets (3.1.0) fastimage (2.1.0) - ffi (1.9.17) + ffi (1.9.18) forwardable-extended (2.6.0) - jekyll (3.4.0) + jekyll (3.5.2) addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 3.0) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-assets (2.2.8) - extras (~> 0.1) + jekyll-assets (2.3.2) + concurrent-ruby (~> 1.0) + extras (~> 0.2) fastimage (~> 2.0, >= 1.8) jekyll (~> 3.1, >= 3.0) pathutil (>= 0.8) - rack (> 1, < 2) - sprockets (~> 3.3, < 3.7) - jekyll-multiple-languages-plugin (1.5.1) - jekyll (>= 2.0, < 4.0) + rack (~> 1.6) + sprockets (~> 3.3, < 3.8) jekyll-sass-converter (1.5.0) sass (~> 3.4) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) + kramdown (1.14.0) + liquid (4.0.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) - mini_magick (4.6.1) + method_source (0.8.2) + mini_magick (4.8.0) pathutil (0.14.0) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rack (1.6.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.5.0) + byebug (~> 9.1) + pry (~> 0.10) + public_suffix (3.0.0) + rack (1.6.8) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.23) - sprockets (3.6.3) + sass (3.5.1) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + slop (3.6.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -60,11 +74,12 @@ PLATFORMS ruby DEPENDENCIES + byebug facets jekyll jekyll-assets - jekyll-multiple-languages-plugin mini_magick + pry-byebug BUNDLED WITH - 1.13.6 + 1.14.6 diff --git a/blog/_config.yml b/blog/_config.yml index 0ec85b6..dfd4d05 100644 --- a/blog/_config.yml +++ b/blog/_config.yml @@ -1,5 +1,5 @@ --- -languages: ["nb", "en"] +languages: ["no", "en"] exclude_from_localizations: ["assets", "css"] title: Norsk Urskog description: @@ -7,11 +7,7 @@ description: way to promote unknown and underground metal bands from Norway. The sampler is distributed at the Inferno Metal Festival in Oslo, and some other festivals/concerts as supplies last. - -gems: - - jekyll-assets - - jekyll-multiple-languages-plugin - +baseurl: / assets: features: liquid: true @@ -22,6 +18,7 @@ collections: volunteers: future: true +permalink: pretty defaults: - -- cgit v1.2.3