From 00077cdd4d8d83bf9760496a43bc7b0b3c9f54fd Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 26 Apr 2016 10:24:07 +0100 Subject: [PATCH 1/6] Add rouge gem --- Gemfile | 1 + Gemfile.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index a28dfb22a..1fec7691d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source "http://rubygems.org" gem "github-pages" +gem "rouge" diff --git a/Gemfile.lock b/Gemfile.lock index a38db7c66..c50554029 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,6 +129,7 @@ PLATFORMS DEPENDENCIES github-pages + rouge BUNDLED WITH 1.11.2 From 1c2c952e2ad62f20737bf793ec0df335bfab30f6 Mon Sep 17 00:00:00 2001 From: stonio Date: Fri, 24 Jun 2016 17:11:27 +0200 Subject: [PATCH 2/6] Polish page.html Remove default attributes and other little improvements. --- _includes/page.html | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/_includes/page.html b/_includes/page.html index 53cf5738d..580751dec 100644 --- a/_includes/page.html +++ b/_includes/page.html @@ -1,10 +1,10 @@ {{ site.name }} - + - + @@ -18,21 +18,21 @@ {{ head_links }} - - - + + + - - - - - - + + + + + - + Pivotal Software, Inc. All Rights Reserved. - Terms of Use and - Privacy + Terms of Use and + Privacy From ce11407d96da20780a8c439edf11508dd98bffce Mon Sep 17 00:00:00 2001 From: stonio Date: Fri, 24 Jun 2016 17:37:27 +0200 Subject: [PATCH 3/6] remove alt attribute in
--- _includes/badges.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/badges.html b/_includes/badges.html index ae873f454..e9d8571ba 100644 --- a/_includes/badges.html +++ b/_includes/badges.html @@ -1,7 +1,7 @@ {% if page.badges.twitter %}
- @@ -9,7 +9,7 @@ {% for badge in page.badges.custom %}
-
+
From ce422b042e0e6e64e0dfd3d52e408fd8842a90fd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2016 09:20:02 +0100 Subject: [PATCH 4/6] Upgrade github-pages gem to fix deprecation warnings Previously, when running bundle exec jekyll serve a false-positive deprecation warning was reported: Deprecation: Auto-regeneration can no longer be set from your configuration file(s). Use the --[no-]watch/-w command-line option instead. See https://github.com/jekyll/jekyll/issues/4831 for some details. Jekyll 3.0.5 fixes the problem. This commit upgrades to the latest version of github-pages, thereby also upgrading to Jekyll 3.0.5 --- Gemfile.lock | 64 ++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c50554029..53819a4fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: http://rubygems.org/ specs: - RedCloth (4.2.9) activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -14,36 +13,32 @@ GEM execjs coffee-script-source (1.10.0) colorator (0.1) - ethon (0.8.1) + ethon (0.9.0) ffi (>= 1.3.0) - execjs (2.6.0) + execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.10) + ffi (1.9.13) gemoji (2.1.0) - github-pages (75) - RedCloth (= 4.2.9) + github-pages (86) github-pages-health-check (= 1.1.0) - jekyll (= 3.0.4) + jekyll (= 3.1.6) jekyll-coffeescript (= 1.0.1) jekyll-feed (= 0.5.1) jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 1.11.1) - jekyll-mentions (= 1.1.2) + jekyll-github-metadata (= 2.0.2) + jekyll-mentions (= 1.1.3) jekyll-paginate (= 1.1.0) jekyll-redirect-from (= 0.10.0) jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 1.3.3) + jekyll-seo-tag (= 2.0.0) jekyll-sitemap (= 0.10.0) - jekyll-textile-converter (= 0.1.0) jemoji (= 0.6.2) - kramdown (= 1.10.0) + kramdown (= 1.11.1) liquid (= 3.0.6) listen (= 3.0.6) mercenary (~> 0.3) - rdiscount (= 2.1.8) - redcarpet (= 3.3.3) - rouge (= 1.10.1) + rouge (= 1.11.1) terminal-table (~> 1.4) github-pages-health-check (1.1.0) addressable (~> 2.3) @@ -51,11 +46,11 @@ GEM octokit (~> 4.0) public_suffix (~> 1.4) typhoeus (~> 0.7) - html-pipeline (2.4.0) + html-pipeline (2.4.1) activesupport (>= 2, < 5) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.0.4) + jekyll (3.1.6) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -69,9 +64,10 @@ GEM jekyll-feed (0.5.1) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (1.11.1) + jekyll-github-metadata (2.0.2) + jekyll (~> 3.1) octokit (~> 4.0) - jekyll-mentions (1.1.2) + jekyll-mentions (1.1.3) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -79,45 +75,43 @@ GEM jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-seo-tag (1.3.3) - jekyll (~> 3.0) + jekyll-seo-tag (2.0.0) + jekyll (~> 3.1) jekyll-sitemap (0.10.0) - jekyll-textile-converter (0.1.0) - RedCloth (~> 4.0) - jekyll-watch (1.3.1) - listen (~> 3.0) + jekyll-watch (1.4.0) + listen (~> 3.0, < 3.1) jemoji (0.6.2) gemoji (~> 2.0) html-pipeline (~> 2.2) jekyll (>= 3.0) json (1.8.3) - kramdown (1.10.0) + kramdown (1.11.1) liquid (3.0.6) listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.0.0) - minitest (5.8.4) + mini_portile2 (2.1.0) + minitest (5.9.0) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) + pkg-config (1.1.7) public_suffix (1.5.3) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - rdiscount (2.1.8) - redcarpet (3.3.3) - rouge (1.10.1) + rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - terminal-table (1.5.2) + terminal-table (1.6.0) thread_safe (0.3.5) typhoeus (0.8.0) ethon (>= 0.8.0) @@ -132,4 +126,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.11.2 + 1.12.5 From e7438db1defa53bfa2fa9eecf1a5c05eea261ad3 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Sun, 9 Oct 2016 15:42:10 +0200 Subject: [PATCH 5/6] Jekyll must be run with "bundle exec" command --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 867bb3a1d..96afe56b4 100644 --- a/README.markdown +++ b/README.markdown @@ -107,7 +107,7 @@ Assuming you're already within your project's clone directory, and you've alread Use the `--watch` flag to pick up changes to files as you make them, allowing you a nice edit-and-refresh workflow. - jekyll serve --watch + bundle exec jekyll serve --watch > **Important:** Because the `baseurl` is set explicitly within your project's `_config.yml` file, you'll need to fully-qualify the URL to view your project. For example, if your project is named "spring-xyz", your URL when running Jekyll locally will be . Don't forget the trailing slash! You'll get a 404 without it. From b2be58e5da6100a99b25910b0efbe2fa6e391864 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 23 Mar 2017 15:58:52 +0100 Subject: [PATCH 6/6] Add defensive check for empty repository key --- js/projectDocumentationWidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/projectDocumentationWidget.js b/js/projectDocumentationWidget.js index 2e30a3587..a52d9ba61 100644 --- a/js/projectDocumentationWidget.js +++ b/js/projectDocumentationWidget.js @@ -95,7 +95,7 @@ Spring.SnippetView = Backbone.View.extend({ this.combinedTemplate = _.template( "
" +
         downloadTemplate.find("code:first").html() +
-        "{@ if (repository) { @}" +
+        "{@ if (typeof(repository) != \"undefined\") { @}" +
         repositoryTemplate.find("code:first").html() +
         "{@ } @}" +
         "
"