Skip to content

Commit 58f51f4

Browse files
pengwynnpengwynn
committed
Merge master
2 parents 55264c4 + 6e85789 commit 58f51f4

43 files changed

Lines changed: 563 additions & 546 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ tmp
44
.bundle
55
bin
66
crash.log
7+
/vendor/gems/
8+
/bin/
9+
/.bundle/

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
language: ruby
2+
rvm:
3+
- 1.9.3

‎Gemfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'coderay'
77
gem 'kramdown', '~> 0.13.2'
88
gem 'mime-types', '~> 1.16'
99
gem 'nanoc', '~> 3.4.3'
10-
gem 'nokogiri', '~> 1.4.4'
10+
gem 'nokogiri', '~> 1.6.0'
1111
gem 'pygments.rb'
1212
gem 'rake', '~> 0.9.2'
1313
gem 'thin'
@@ -17,3 +17,7 @@ group :development do
1717
gem 'adsf'
1818
gem 'fssm'
1919
end
20+
21+
group :test do
22+
gem 'html-proofer', '~> 0.6.0'
23+
end

‎Gemfile.lock‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,47 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
adsf (1.1.1)
4+
adsf (1.2.0)
55
rack (>= 1.0.0)
66
blankslate (3.1.2)
77
builder (3.2.2)
8-
coderay (1.0.9)
8+
coderay (1.1.0)
99
colored (1.2)
10-
cri (2.3.0)
10+
cri (2.4.1)
1111
colored (>= 1.2)
1212
daemons (1.1.9)
13+
ethon (0.6.2)
14+
ffi (>= 1.3.0)
15+
mime-types (~> 1.18)
1316
eventmachine (1.0.3)
14-
ffi (1.0.11)
17+
ffi (1.9.3)
1518
fssm (0.2.10)
19+
html-proofer (0.6.0)
20+
colored (~> 1.2)
21+
mercenary (~> 0.2.0)
22+
nokogiri (~> 1.6.0)
23+
typhoeus (~> 0.6.7)
1624
kramdown (0.13.8)
17-
mime-types (1.23)
25+
mercenary (0.2.1)
26+
mime-types (1.25.1)
27+
mini_portile (0.5.2)
1828
nanoc (3.4.3)
1929
cri (~> 2.2)
20-
nokogiri (1.4.7)
21-
pygments.rb (0.2.13)
22-
rubypython (~> 0.5.3)
30+
nokogiri (1.6.1)
31+
mini_portile (~> 0.5.0)
32+
pygments.rb (0.2.3)
33+
rubypython (>= 0.5.1)
2334
rack (1.5.2)
2435
rake (0.9.6)
25-
rubypython (0.5.3)
36+
rubypython (0.6.3)
2637
blankslate (>= 2.1.2.3)
27-
ffi (~> 1.0.7)
28-
thin (1.5.1)
38+
ffi (>= 1.0.7)
39+
thin (1.6.1)
2940
daemons (>= 1.0.9)
30-
eventmachine (>= 0.12.6)
41+
eventmachine (>= 1.0.0)
3142
rack (>= 1.0.0)
43+
typhoeus (0.6.7)
44+
ethon (~> 0.6.2)
3245
yajl-ruby (0.8.3)
3346

3447
PLATFORMS
@@ -39,10 +52,11 @@ DEPENDENCIES
3952
builder
4053
coderay
4154
fssm
55+
html-proofer (~> 0.6.0)
4256
kramdown (~> 0.13.2)
4357
mime-types (~> 1.16)
4458
nanoc (~> 3.4.3)
45-
nokogiri (~> 1.4.4)
59+
nokogiri (~> 1.6.0)
4660
pygments.rb
4761
rake (~> 0.9.2)
4862
thin

‎Rakefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
require 'nanoc3/tasks'
2+
require 'html/proofer'
3+
4+
task :default => [:test]
25

36
desc "Compile the site"
47
task :compile do
58
`nanoc compile`
69
end
710

11+
desc "Test the output"
12+
task :test => [:clean, :compile] do
13+
HTML::Proofer.new("./output").run
14+
end
15+
816
# Prompt user for a commit message; default: P U B L I S H :emoji:
917
def commit_message
1018
publish_emojis = [':boom:', ':rocket:', ':metal:', ':bulb:', ':zap:',

‎changes/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ <h3 id="events">Events</h3>
146146
<h2 id="preview-period">Preview Period</h2>
147147

148148
<p>We’re making this new API available today for developers to
149-
<a href="/v3/repos/deployments/#preview-mode">preview</a>. We think developers and existing integrations are
149+
<a href="/v3/repos/deployments/#preview-mode" data-proofer-ignore>preview</a>. We think developers and existing integrations are
150150
going to love it, but we want to <a href="https://github.com/contact?form%5Bsubject%5D=Deployments+API">get your feedback</a> before we declare
151151
the Deployments API “final” and “unchangeable.” We expect the preview period to
152152
last for roughly 60-90 days.</p>

‎content/changes/2012-10-17-org-members-redirection.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author_name: pezra
77

88
Requesting the [member list](/v3/orgs/members/index.html#members-list) of an
99
organization of which you are not a member now redirects to the [public members
10-
list](v3/orgs/members/index.html#public-members-list). Similarly, requests to
10+
list](/v3/orgs/members/index.html#public-members-list). Similarly, requests to
1111
[membership check](/v3/orgs/members/index.html#check-membership) resources of
1212
an organization of which you are not a member are redirected to the equivalent
1313
[public membership check](/v3/orgs/members/index.html#check-public-membership).

‎content/changes/2012-12-06-create-authorization-for-app.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
No more implementing the [web flow][web-flow] just to get a token tied to your
3535
app's rate limit.
3636

37-
[oauth-api]: /v3/oauth/#oauth-authorizations-api
37+
[oauth-api]: /v3/oauth_authorizations/#oauth-authorizations-api
3838
[web-flow]: /v3/oauth/#web-application-flow

‎content/changes/2012-12-09-organization-repositories-results-now-paginate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
author_name: rick
66
---
77

8-
![](https://github-images.s3.amazonaws.com/skitch/seger-turn-the-page-20121209-154956.png)
8+
![seger-is-so-dreamy](https://github-images.s3.amazonaws.com/skitch/seger-turn-the-page-20121209-154956.png)
99

1010
Improvements continue to the Organizations Repository listing endpoint.
1111
Today we're improving pagination so that it works as documented. Now

‎content/changes/2013-05-06-repository-stats.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ but we can't wait to see what others can do with this information.
1111

1212
Starting today, these resources are available to you:
1313

14-
* **[Contributors](/v3/repos/statistics/#get-contributors-list-with-additions-deletions-and-commit-counts)**
15-
* **[Commit Activity](/v3/repos/statistics/#get-the-last-year-of-commit-activity-data)**
16-
* **[Code Frequency](/v3/repos/statistics/#get-the-number-of-additions-and-deletions-per-week)**
17-
* **[Participation](/v3/repos/statistics/#get-the-weekly-commit-count-for-the-repo-owner-and-everyone-else)**
18-
* **[Punch Card](/v3/repos/statistics/#get-the-number-of-commits-per-hour-in-each-day)**
14+
* **[Contributors](/v3/repos/statistics/#contributors)**
15+
* **[Commit Activity](/v3/repos/statistics/#commit-activity)**
16+
* **[Code Frequency](/v3/repos/statistics/#code-frequency)**
17+
* **[Participation](/v3/repos/statistics/#participation)**
18+
* **[Punch Card](/v3/repos/statistics/#punch-card)**
1919

2020
Enjoy!

0 commit comments

Comments
 (0)