From d82d5b9a54e966eef68e8a8c151ca86900d9a64b Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 2 Feb 2016 03:26:44 +0300 Subject: bump dependencies --- Gemfile | 1 - Gemfile.lock | 88 +++++++++++++++++++++++---------------------------------- README.md | 2 -- _config.yml | 1 + _config_dev.yml | 1 - 5 files changed, 37 insertions(+), 56 deletions(-) diff --git a/Gemfile b/Gemfile index df51e41..84b3963 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' gem 'github-pages' -gem 'rouge' gem 'wdm', '~> 0.1.0' if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index dbbf2a6..78b5850 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,141 +3,126 @@ GEM specs: RedCloth (4.2.9) RedCloth (4.2.9-x86-mingw32) - activesupport (4.2.5) + activesupport (4.2.5.1) 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) - blankslate (2.1.2.4) - classifier-reborn (2.0.4) - fast-stemmer (~> 1.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) colorator (0.1) - ethon (0.8.0) + ethon (0.8.1) ffi (>= 1.3.0) execjs (2.6.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - fast-stemmer (1.0.2) ffi (1.9.10-x64-mingw32) ffi (1.9.10-x86-mingw32) gemoji (2.1.0) - github-pages (40) + github-pages (44) RedCloth (= 4.2.9) - github-pages-health-check (= 0.5.3) - jekyll (= 2.4.0) + github-pages-health-check (= 0.6.0) + jekyll (= 3.0.2) jekyll-coffeescript (= 1.0.1) jekyll-feed (= 0.3.1) jekyll-gist (= 1.4.0) - jekyll-mentions (= 0.2.1) + jekyll-mentions (= 1.0.0) jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.8.0) + jekyll-redirect-from (= 0.9.1) jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 0.1.4) jekyll-sitemap (= 0.9.0) - jemoji (= 0.5.0) + jekyll-textile-converter (= 0.1.0) + jemoji (= 0.5.1) kramdown (= 1.9.0) - liquid (= 2.6.2) - maruku (= 0.7.0) + liquid (= 3.0.6) mercenary (~> 0.3) - pygments.rb (= 0.6.3) rdiscount (= 2.1.8) redcarpet (= 3.3.3) + rouge (= 1.10.1) terminal-table (~> 1.4) - github-pages-health-check (0.5.3) + github-pages-health-check (0.6.0) addressable (~> 2.3) net-dns (~> 0.8) public_suffix (~> 1.4) typhoeus (~> 0.7) - html-pipeline (1.9.0) - activesupport (>= 2) - nokogiri (~> 1.4) + html-pipeline (2.3.0) + activesupport (>= 2, < 5) + nokogiri (>= 1.4) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) + jekyll (3.0.2) colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) jekyll-feed (0.3.1) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-mentions (0.2.1) - html-pipeline (~> 1.9.0) - jekyll (~> 2.0) + jekyll-mentions (1.0.0) + html-pipeline (~> 2.2) + jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.8.0) + jekyll-redirect-from (0.9.1) jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) + jekyll-seo-tag (0.1.4) + jekyll (>= 2.0) jekyll-sitemap (0.9.0) - jekyll-watch (1.3.0) + jekyll-textile-converter (0.1.0) + RedCloth (~> 4.0) + jekyll-watch (1.3.1) listen (~> 3.0) - jemoji (0.5.0) + jemoji (0.5.1) gemoji (~> 2.0) - html-pipeline (~> 1.9) + html-pipeline (~> 2.2) jekyll (>= 2.0) json (1.8.3) kramdown (1.9.0) - liquid (2.6.2) + liquid (3.0.6) listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - maruku (0.7.0) mercenary (0.3.5) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.7.1-x64-mingw32) + nokogiri (1.6.7.2-x64-mingw32) mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7.1-x86-mingw32) + nokogiri (1.6.7.2-x86-mingw32) mini_portile2 (~> 2.0.0.rc2) octokit (4.2.0) sawyer (~> 0.6.0, >= 0.5.3) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.11) public_suffix (1.5.3) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) rdiscount (2.1.8) redcarpet (3.3.3) rouge (1.10.1) safe_yaml (1.0.4) - sass (3.4.20) + sass (3.4.21) sawyer (0.6.0) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) terminal-table (1.5.2) thread_safe (0.3.5) - toml (0.1.2) - parslet (~> 1.5.0) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) wdm (0.1.1) - yajl-ruby (1.2.1) PLATFORMS x64-mingw32 @@ -145,7 +130,6 @@ PLATFORMS DEPENDENCIES github-pages - rouge wdm (~> 0.1.0) BUNDLED WITH diff --git a/README.md b/README.md index 48888a8..1f5d17b 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,6 @@ In particular, it `min`ified versions, * sets `include_comments` to `false` to exclude the Disqus comments section from the posts, -* opts for the `rouge` gem for syntax highlighting instead of the default - [Pygments](http://pygments.org/), * sets `baseurl` to an empty string, pretending the website access from the root directory of a domain instead of from `cpp_tips/`. diff --git a/_config.yml b/_config.yml index e875a3e..339b7fe 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,5 @@ baseurl: /cpp_tips +gems: [jekyll-paginate] paginate: 10 include_comments: true excerpt_separator: "" diff --git a/_config_dev.yml b/_config_dev.yml index bebcafe..0015e2e 100644 --- a/_config_dev.yml +++ b/_config_dev.yml @@ -1,4 +1,3 @@ baseurl: "" include_comments: false minified_externals: false -highlighter: rouge -- cgit v1.2.3