Skip to content

Commit 507be07

Browse files
author
Dave Syer
committed
Merge upstream (changes in github to use jekyll 3.0)
2 parents dd4d8fc + 9191438 commit 507be07

File tree

5 files changed

+142
-55
lines changed

5 files changed

+142
-55
lines changed

‎Gemfile.lock

Lines changed: 121 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,133 @@ GEM
22
remote: http://rubygems.org/
33
specs:
44
RedCloth (4.2.9)
5-
classifier (1.3.3)
6-
fast-stemmer (>= 1.0.0)
5+
activesupport (4.2.6)
6+
i18n (~> 0.7)
7+
json (~> 1.7, >= 1.7.7)
8+
minitest (~> 5.1)
9+
thread_safe (~> 0.3, >= 0.3.4)
10+
tzinfo (~> 1.1)
11+
addressable (2.4.0)
12+
coffee-script (2.4.1)
13+
coffee-script-source
14+
execjs
15+
coffee-script-source (1.10.0)
716
colorator (0.1)
8-
commander (4.1.5)
9-
highline (~> 1.6.11)
10-
directory_watcher (1.4.1)
11-
fast-stemmer (1.0.2)
12-
github-pages (1)
17+
ethon (0.8.1)
18+
ffi (>= 1.3.0)
19+
execjs (2.6.0)
20+
faraday (0.9.2)
21+
multipart-post (>= 1.2, < 3)
22+
ffi (1.9.10)
23+
gemoji (2.1.0)
24+
github-pages (75)
1325
RedCloth (= 4.2.9)
14-
jekyll (= 1.1.2)
15-
kramdown (= 1.0.2)
16-
liquid (= 2.5.1)
17-
maruku (= 0.6.1)
18-
rdiscount (= 1.6.8)
19-
redcarpet (= 2.2.2)
20-
highline (1.6.19)
21-
jekyll (1.1.2)
22-
classifier (~> 1.3)
26+
github-pages-health-check (= 1.1.0)
27+
jekyll (= 3.0.4)
28+
jekyll-coffeescript (= 1.0.1)
29+
jekyll-feed (= 0.5.1)
30+
jekyll-gist (= 1.4.0)
31+
jekyll-github-metadata (= 1.11.1)
32+
jekyll-mentions (= 1.1.2)
33+
jekyll-paginate (= 1.1.0)
34+
jekyll-redirect-from (= 0.10.0)
35+
jekyll-sass-converter (= 1.3.0)
36+
jekyll-seo-tag (= 1.3.3)
37+
jekyll-sitemap (= 0.10.0)
38+
jekyll-textile-converter (= 0.1.0)
39+
jemoji (= 0.6.2)
40+
kramdown (= 1.10.0)
41+
liquid (= 3.0.6)
42+
listen (= 3.0.6)
43+
mercenary (~> 0.3)
44+
rdiscount (= 2.1.8)
45+
redcarpet (= 3.3.3)
46+
rouge (= 1.10.1)
47+
terminal-table (~> 1.4)
48+
github-pages-health-check (1.1.0)
49+
addressable (~> 2.3)
50+
net-dns (~> 0.8)
51+
octokit (~> 4.0)
52+
public_suffix (~> 1.4)
53+
typhoeus (~> 0.7)
54+
html-pipeline (2.4.0)
55+
activesupport (>= 2, < 5)
56+
nokogiri (>= 1.4)
57+
i18n (0.7.0)
58+
jekyll (3.0.4)
2359
colorator (~> 0.1)
24-
commander (~> 4.1.3)
25-
directory_watcher (~> 1.4.1)
26-
kramdown (~> 1.0.2)
27-
liquid (~> 2.5.1)
28-
maruku (~> 0.5)
29-
pygments.rb (~> 0.5.0)
30-
redcarpet (~> 2.2.2)
31-
safe_yaml (~> 0.7.0)
32-
kramdown (1.0.2)
33-
liquid (2.5.1)
34-
maruku (0.6.1)
35-
syntax (>= 1.0.0)
36-
posix-spawn (0.3.6)
37-
pygments.rb (0.5.2)
38-
posix-spawn (~> 0.3.6)
39-
yajl-ruby (~> 1.1.0)
40-
rdiscount (1.6.8)
41-
redcarpet (2.2.2)
42-
safe_yaml (0.7.1)
43-
syntax (1.0.0)
44-
yajl-ruby (1.1.0)
60+
jekyll-sass-converter (~> 1.0)
61+
jekyll-watch (~> 1.1)
62+
kramdown (~> 1.3)
63+
liquid (~> 3.0)
64+
mercenary (~> 0.3.3)
65+
rouge (~> 1.7)
66+
safe_yaml (~> 1.0)
67+
jekyll-coffeescript (1.0.1)
68+
coffee-script (~> 2.2)
69+
jekyll-feed (0.5.1)
70+
jekyll-gist (1.4.0)
71+
octokit (~> 4.2)
72+
jekyll-github-metadata (1.11.1)
73+
octokit (~> 4.0)
74+
jekyll-mentions (1.1.2)
75+
html-pipeline (~> 2.3)
76+
jekyll (~> 3.0)
77+
jekyll-paginate (1.1.0)
78+
jekyll-redirect-from (0.10.0)
79+
jekyll (>= 2.0)
80+
jekyll-sass-converter (1.3.0)
81+
sass (~> 3.2)
82+
jekyll-seo-tag (1.3.3)
83+
jekyll (~> 3.0)
84+
jekyll-sitemap (0.10.0)
85+
jekyll-textile-converter (0.1.0)
86+
RedCloth (~> 4.0)
87+
jekyll-watch (1.3.1)
88+
listen (~> 3.0)
89+
jemoji (0.6.2)
90+
gemoji (~> 2.0)
91+
html-pipeline (~> 2.2)
92+
jekyll (>= 3.0)
93+
json (1.8.3)
94+
kramdown (1.10.0)
95+
liquid (3.0.6)
96+
listen (3.0.6)
97+
rb-fsevent (>= 0.9.3)
98+
rb-inotify (>= 0.9.7)
99+
mercenary (0.3.6)
100+
mini_portile2 (2.0.0)
101+
minitest (5.8.4)
102+
multipart-post (2.0.0)
103+
net-dns (0.8.0)
104+
nokogiri (1.6.7.2)
105+
mini_portile2 (~> 2.0.0.rc2)
106+
octokit (4.3.0)
107+
sawyer (~> 0.7.0, >= 0.5.3)
108+
public_suffix (1.5.3)
109+
rb-fsevent (0.9.7)
110+
rb-inotify (0.9.7)
111+
ffi (>= 0.5.0)
112+
rdiscount (2.1.8)
113+
redcarpet (3.3.3)
114+
rouge (1.10.1)
115+
safe_yaml (1.0.4)
116+
sass (3.4.22)
117+
sawyer (0.7.0)
118+
addressable (>= 2.3.5, < 2.5)
119+
faraday (~> 0.8, < 0.10)
120+
terminal-table (1.5.2)
121+
thread_safe (0.3.5)
122+
typhoeus (0.8.0)
123+
ethon (>= 0.8.0)
124+
tzinfo (1.2.2)
125+
thread_safe (~> 0.1)
45126

46127
PLATFORMS
47128
ruby
48129

49130
DEPENDENCIES
50131
github-pages
132+
133+
BUNDLED WITH
134+
1.11.2

‎README.markdown

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Spring's project pages are based on [Jekyll](http://jekyllrb.com) and [GitHub Pa
44

55
This approach may sound a little funky (and it is), but it's way better than the misery of Git submodules. In fact, it's actually pretty easy. If you're just getting started, then follow the directions immediately below. If you're needing a refresher on how to keep things up to date, then head to the section at the bottom on "keeping up to date".
66

7+
> ***Note:*** Github changed their rendering (a lot) in April 2016. If you are seeing pages build failures since that time, then you probably need to merge some changes from this upstream. Follow the instructions below, and for testing locally use rubiy 2.x and don't forget to `bundle exec ...` everything.
8+
9+
710

811
# How to start a new `gh-pages` project page
912

@@ -95,7 +98,7 @@ Assuming you're already within your project's clone directory, and you've alread
9598

9699
### Install jekyll if you have not already
97100

98-
> **Note:** Jekyll 1.1.2 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it:
101+
> **Note:** Jekyll 3.0.4 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it:
99102
100103
gem install bundler
101104
bundle

‎_config.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
### Global gh-pages pre-amble
22
safe: true
33
lsi: false
4-
pygments: true
5-
markdown: redcarpet
6-
redcarpet:
7-
extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
8-
4+
highlighter: rouge
5+
markdown: kramdown
6+
encoding: UTF-8
7+
github: [metadata]
8+
kramdown:
9+
input: GFM
10+
hard_wrap: false
11+
smart_quotes: ["apos", "apos", "quot", "quot"]
12+
gems:
13+
- jekyll-coffeescript
14+
- jekyll-paginate
915

1016
### The following properties will change on a project-by-project basis
1117

@@ -34,4 +40,4 @@ projects_site_url: http://projects.spring.io
3440
questions_url: http://spring.io/questions
3541

3642
version: 1.0.0.BUILD-SNAPSHOT
37-
exclude: [code]
43+
exclude: [code]

‎_includes/page.html

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png"/>
55

66
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap.min.css" />
7-
<link href='http://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
7+
<link href='//fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
88
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/font-awesome/css/font-awesome.min.css" />
99
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap-select.css" />
1010

@@ -114,15 +114,9 @@
114114
</div>
115115
</div>
116116
&copy; <script type="text/javascript"> var d = new Date();
117-
document.write(d.getFullYear());</script> <a href="http://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
118-
<a href="http://www.pivotal.io/terms-of-use">Terms of Use</a> and
119-
<a href="http://www.pivotal.io/privacy-policy">Privacy</a>
120-
</div>
121-
<div class="span4 footer-newsletter--wrapper pull-right">
122-
<div class="footer-newsletter--container">
123-
<label>Subscribe to our newsletter</label>
124-
<iframe frameborder="0" height="42px" scrolling="no" src="http://play.gopivotal.com/OSS_Website_Spring_SpringNewsletterSubscriptionEmailOnly.html" style="border:none" width="324px"></iframe>
125-
</div>
117+
document.write(d.getFullYear());</script> <a href="https://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
118+
<a href="https://www.pivotal.io/terms-of-use">Terms of Use</a> and
119+
<a href="https://www.pivotal.io/privacy-policy">Privacy</a>
126120
</div>
127121
</div>
128122
</div>

‎js/copySnippets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(document).ready(function() {
88

99
Spring.configureCopyButtons = function() {
1010
if (ZeroClipboard.detectFlashSupport()) {
11-
$(".highlight > pre").each(function(index) {
11+
$("pre.highlight").each(function(index) {
1212
Spring.buildCopyButton($(this), index);
1313
}
1414
);

0 commit comments

Comments
 (0)