You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/03/14 17:35:41 UTC
[2/4] struts-site git commit: Upgrades to Jekyll 3
Upgrades to Jekyll 3
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/bb6a626a
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/bb6a626a
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/bb6a626a
Branch: refs/heads/master
Commit: bb6a626aa7cc63bf99b03958f8826e9672c780f8
Parents: 3a87e1b
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Mar 4 11:51:30 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Mon Mar 14 17:35:27 2016 +0100
----------------------------------------------------------------------
Gemfile | 2 +-
Gemfile.lock | 71 ++++++++++++++++---------------------------------------
_config.yml | 17 ++++++-------
3 files changed, 28 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index cc68592..a8af254 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
ruby '2.2.3'
-gem 'jekyll', '~> 2'
+gem 'jekyll', '~> 3'
http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/Gemfile.lock
----------------------------------------------------------------------
diff --git a/Gemfile.lock b/Gemfile.lock
index 757f503..12f4dba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,70 +1,39 @@
GEM
remote: https://rubygems.org/
specs:
- blankslate (2.1.2.4)
- celluloid (0.16.0)
- timers (~> 4.0.0)
- classifier-reborn (2.0.3)
- fast-stemmer (~> 1.0)
- coffee-script (2.3.0)
- coffee-script-source
- execjs
- coffee-script-source (1.9.1)
colorator (0.1)
- execjs (2.3.0)
- fast-stemmer (1.0.2)
- ffi (1.9.6)
- hitimes (1.2.2)
- jekyll (2.5.3)
- classifier-reborn (~> 2.0)
+ ffi (1.9.10)
+ jekyll (3.1.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-gist (1.1.0)
- jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.3.0)
- sass (~> 3.2)
- jekyll-watch (1.2.1)
- listen (~> 2.7)
- kramdown (1.5.0)
- liquid (2.6.2)
- listen (2.8.5)
- celluloid (>= 0.15.2)
+ jekyll-sass-converter (1.4.0)
+ sass (~> 3.4)
+ jekyll-watch (1.3.1)
+ listen (~> 3.0)
+ kramdown (1.10.0)
+ liquid (3.0.6)
+ listen (3.0.6)
rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
+ rb-inotify (>= 0.9.7)
mercenary (0.3.5)
- parslet (1.5.0)
- blankslate (~> 2.0)
- posix-spawn (0.3.10)
- pygments.rb (0.6.2)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.2.0)
- rb-fsevent (0.9.4)
- rb-inotify (0.9.5)
+ rb-fsevent (0.9.7)
+ rb-inotify (0.9.7)
ffi (>= 0.5.0)
- redcarpet (3.2.2)
+ rouge (1.10.1)
safe_yaml (1.0.4)
- sass (3.4.12)
- timers (4.0.1)
- hitimes
- toml (0.1.2)
- parslet (~> 1.5.0)
- yajl-ruby (1.2.1)
+ sass (3.4.21)
PLATFORMS
ruby
DEPENDENCIES
- jekyll (~> 2)
+ jekyll (~> 3)
+
+BUNDLED WITH
+ 1.11.2
http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index cbac87d..e9e00fe 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,7 +1,6 @@
name: Apache Struts
markdown: kramdown
markdown_ext: md
-highlighter: pygments
source: source
destination: content
encoding: UTF-8
@@ -11,15 +10,13 @@ kramdown:
entity_output: as_char
toc_levels: 1..6
smart_quotes: lsquo,rsquo,ldquo,rdquo
- use_coderay: true
-
- coderay:
- coderay_wrap: div
- coderay_line_numbers: inline
- coderay_line_number_start: 1
- coderay_tab_width: 4
- coderay_bold_every: 10
- coderay_css: style
+ syntax_highlighter_opts:
+ wrap: div
+ line_numbers: inline
+ line_number_start: 1
+ tab_width: 4
+ bold_every: 10
+ css: style
# Defines root of the site:
# "" - when you want to deploy to production