Skip to content

Commit 3a147df

Browse files
author
Hubot
committed
Sync changes from upstream repository
1 parent dfdd395 commit 3a147df

File tree

14 files changed

+65
-17
lines changed

14 files changed

+65
-17
lines changed

‎Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ gem 'yajl-ruby', '~> 0.8.2'
1616
group :development do
1717
gem 'adsf'
1818
gem 'fssm'
19+
gem 'guard-nanoc'
1920
end
2021

2122
group :test do

‎Gemfile.lock

+29
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ GEM
44
adsf (1.2.0)
55
rack (>= 1.0.0)
66
builder (3.2.2)
7+
celluloid (0.15.2)
8+
timers (~> 1.1.0)
79
coderay (1.1.0)
810
colored (1.2)
911
cri (2.6.1)
@@ -13,28 +15,54 @@ GEM
1315
ffi (>= 1.3.0)
1416
eventmachine (1.0.3)
1517
ffi (1.9.3)
18+
formatador (0.2.5)
1619
fssm (0.2.10)
20+
guard (2.6.1)
21+
formatador (>= 0.2.4)
22+
listen (~> 2.7)
23+
lumberjack (~> 1.0)
24+
pry (>= 0.9.12)
25+
thor (>= 0.18.1)
26+
guard-nanoc (1.0.2)
27+
guard (>= 1.8.0)
28+
nanoc (>= 3.6.3)
1729
html-proofer (0.6.8)
1830
colored (~> 1.2)
1931
mercenary (~> 0.3.2)
2032
nokogiri (~> 1.6.0)
2133
typhoeus (~> 0.6.7)
2234
yell (~> 2.0)
2335
kramdown (0.13.8)
36+
listen (2.7.9)
37+
celluloid (>= 0.15.2)
38+
rb-fsevent (>= 0.9.3)
39+
rb-inotify (>= 0.9)
40+
lumberjack (1.0.9)
2441
mercenary (0.3.3)
42+
method_source (0.8.2)
2543
mime-types (1.25.1)
2644
mini_portile (0.6.0)
2745
nanoc (3.7.0)
2846
cri (~> 2.3)
2947
nokogiri (1.6.2.1)
3048
mini_portile (= 0.6.0)
49+
pry (0.10.0)
50+
coderay (~> 1.1.0)
51+
method_source (~> 0.8.1)
52+
slop (~> 3.4)
3153
rack (1.5.2)
3254
rake (0.9.6)
55+
rb-fsevent (0.9.4)
56+
rb-inotify (0.9.5)
57+
ffi (>= 0.5.0)
3358
rouge (1.4.0)
59+
slop (3.6.0)
3460
thin (1.6.2)
3561
daemons (>= 1.0.9)
3662
eventmachine (>= 1.0.0)
3763
rack (>= 1.0.0)
64+
thor (0.19.1)
65+
timers (1.1.0)
3866
typhoeus (0.6.8)
3967
ethon (>= 0.7.0)
4068
yajl-ruby (0.8.3)
@@ -48,6 +76,7 @@ DEPENDENCIES
4876
builder
4977
coderay
5078
fssm
79+
guard-nanoc
5180
html-proofer (~> 0.6.1)
5281
kramdown (~> 0.13.2)
5382
mime-types (~> 1.16)

‎Guardfile

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# A sample Guardfile
2+
# More info at https://github.com/guard/guard#readme
3+
4+
guard 'nanoc' do
5+
watch('nanoc.yaml') # Change this to config.yaml if you use the old config file name
6+
watch('Rules')
7+
watch(%r{^(content|layouts|lib|static)/.*$})
8+
end

‎Rules

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ compile '/v3/*' do
3030
filter :search
3131
filter :erb
3232
filter :kramdown, :toc_levels => [2]
33+
filter :tip_filter
3334
filter :colorize_syntax,
3435
:colorizers => {:javascript => :rouge}
3536
layout item[:layout] || 'api'
@@ -48,13 +49,15 @@ end
4849

4950
compile '/guides/*' do
5051
filter :kramdown, :toc_levels => [2]
52+
filter :tip_filter
5153
filter :erb
5254
filter :colorize_syntax, :default_colorizer => :rouge
5355
layout item[:layout] || 'guides'
5456
end
5557

5658
compile '/webhooks/*' do
5759
filter :kramdown, :toc_levels => [2]
60+
filter :tip_filter
5861
filter :erb
5962
filter :colorize_syntax, :default_colorizer => :rouge
6063
layout item[:layout] || 'webhooks'

‎content/guides/building-a-ci-server.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ At GitHub, we:
153153
* If the code is green, we merge the pull request
154154

155155
All of this communication is funneled back to our chat rooms. You don't need to
156-
build your own CI or deployment setup to use this example.
156+
build your own CI setup to use this example.
157157
You can always rely on [third-party services][integrations].
158158

159159
[deploy API]: /v3/repos/deployments/

‎content/guides/delivering-deployments.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ server we've built above. At GitHub, we:
170170
* Heaven takes the merged code, and deploys it to our production and staging servers
171171
* In the meantime, Heaven also notifies everyone about the build, via [Hubot][hubot] sitting in our chat rooms
172172

173-
That's it! You don't need to build your own CI or deployment setup to use this example.
173+
That's it! You don't need to build your own deployment setup to use this example.
174174
You can always rely on [third-party services][integrations].
175175

176176
[deploy API]: /v3/repos/deployments/

‎content/webhooks/configuring/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Configuring Your Server | GitHub API
2+
title: Configuring your server | GitHub API
33
layout: webhooks
44
---
55

‎content/webhooks/creating/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Creating Webhooks | GitHub API
2+
title: Creating webhooks | GitHub API
33
layout: webhooks
44
---
55

‎content/webhooks/securing/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Securing Your Webhooks | GitHub API
2+
title: Securing your webhooks | GitHub API
33
layout: webhooks
44
---
55

‎content/webhooks/testing/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Testing Webhooks | GitHub API
2+
title: Testing webhooks | GitHub API
33
layout: webhooks
44
---
55

‎layouts/guides.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ <h2><a href="/v3/">API</a></h2>
2525
<li><h3><a href="/guides/">Overview</a></h3></li>
2626
<li><h3><a href="/guides/getting-started/">Getting started</a></h3></li>
2727
<li><h3><a href="/guides/basics-of-authentication/">Basics of authentication</a></h3></li>
28+
<li><h3><a href="/guides/managing-deploy-keys/">Managing deploy keys</a></h3></li>
29+
<li><h3><a href="/guides/using-ssh-agent-forwarding/">Using SSH agent forwarding</a></h3></li>
2830
<li><h3><a href="/guides/rendering-data-as-graphs/">Rendering data as graphs</a></h3></li>
2931
<li><h3><a href="/guides/working-with-comments/">Working with comments</a></h3></li>
3032
<li><h3><a href="/guides/traversing-with-pagination/">Traversing with pagination</a></h3></li>
3133
<li><h3><a href="/guides/building-a-ci-server/">Building a CI server</a></h3></li>
3234
<li><h3><a href="/guides/delivering-deployments/">Delivering deployments</a></h3></li>
33-
<li><h3><a href="/guides/managing-deploy-keys/">Managing deploy keys</a></h3></li>
34-
<li><h3><a href="/guides/using-ssh-agent-forwarding/">Using SSH agent forwarding</a></h3></li>
3535
</ul>
3636
</div>
3737

‎layouts/webhooks.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ <h2><a href="/v3/">API</a></h2>
2222
<div id="js-sidebar" class="sidebar-shell">
2323
<div class="sidebar-module">
2424
<ul>
25-
<li><h3><a href="/webhooks/creating">Creating Webhooks</a></h3></li>
26-
<li><h3><a href="/webhooks/configuring/">Configuring Your Server</a></h3></li>
27-
<li><h3><a href="/webhooks/testing/">Testing Webhooks</a></h3></li>
28-
<li><h3><a href="/webhooks/securing">Securing Your Webhooks</a></h3></li>
25+
<li><h3><a href="/webhooks">Overview</a></h3></li>
26+
<li><h3><a href="/webhooks/creating">Creating webhooks</a></h3></li>
27+
<li><h3><a href="/webhooks/configuring/">Configuring your Server</a></h3></li>
28+
<li><h3><a href="/webhooks/testing/">Testing webhooks</a></h3></li>
29+
<li><h3><a href="/webhooks/securing">Securing Your webhooks</a></h3></li>
2930
</ul>
3031
</div>
3132

‎lib/tip_filter.rb

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
class TipFilter < Nanoc::Filter
2+
identifier :tip_filter
3+
type :text
4+
5+
def run(content, params={})
6+
content = content.gsub(/<p>\{\{#(tip|warning|error)}}<\/p>/, '<div class="alert \1">')
7+
content.gsub(/<p>\{\{\/(tip|warning|error)}}<\/p>/, '</div>')
8+
end
9+
end

‎script/server

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
#!/bin/sh
22

3-
script/bootstrap
4-
5-
bundle exec nanoc autocompile -p 3002 -H thin
6-
7-
3+
echo "Don't forget to run `bundle exec guard`"
4+
bundle exec nanoc view -H thin

0 commit comments

Comments
 (0)