Skip to content

Commit 9bfbbb1

Browse files
author
Hubot
committed
Sync changes from upstream repository
1 parent 15321ac commit 9bfbbb1

14 files changed

+19
-18
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ end
2727

2828
group :test do
2929
gem 'capybara', '2.4.4'
30-
gem 'html-proofer', '~> 2.6'
30+
gem 'html-proofer', '~> 3.0'
3131
gem 'rspec', '3.1'
3232
gem 'selenium-webdriver', '2.45.0'
3333
gem 'jsonlint', '0.1.0'

‎Gemfile.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.2.5)
4+
activesupport (4.2.5.2)
55
i18n (~> 0.7)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
@@ -24,7 +24,7 @@ GEM
2424
colored (~> 1.2)
2525
diff-lcs (1.2.5)
2626
dotenv (2.0.2)
27-
ethon (0.8.0)
27+
ethon (0.8.1)
2828
ffi (>= 1.3.0)
2929
extended-markdown-filter (0.4.6)
3030
html-pipeline (~> 2.0)
@@ -41,7 +41,7 @@ GEM
4141
activesupport
4242
html-pipeline (>= 1.11)
4343
rouge (~> 1.8)
44-
html-proofer (2.6.4)
44+
html-proofer (3.0.2)
4545
activesupport (~> 4.2)
4646
addressable (~> 2.3)
4747
colored (~> 1.2)
@@ -88,7 +88,7 @@ GEM
8888
mime-types-data (~> 3.2015)
8989
mime-types-data (3.2015.1120)
9090
mini_portile2 (2.0.0)
91-
minitest (5.8.3)
91+
minitest (5.8.4)
9292
multi_json (1.11.2)
9393
multipart-post (2.0.0)
9494
nanoc (4.1.2)
@@ -100,15 +100,15 @@ GEM
100100
nanoc-html-pipeline (0.3.3)
101101
html-pipeline (~> 2.0)
102102
nanoc (>= 3.1, < 5.0)
103-
nokogiri (1.6.7.1)
103+
nokogiri (1.6.7.2)
104104
mini_portile2 (~> 2.0.0.rc2)
105105
octokit (4.2.0)
106106
sawyer (~> 0.6.0, >= 0.5.3)
107107
oj (2.14.1)
108108
page-toc-filter (0.0.1)
109109
html-pipeline (~> 2.0)
110110
nokogiri (~> 1.6.4)
111-
parallel (1.6.1)
111+
parallel (1.6.2)
112112
rack (1.6.4)
113113
rack-protection (1.5.3)
114114
rack
@@ -180,7 +180,7 @@ DEPENDENCIES
180180
gemoji (= 2.1.0)
181181
github-markdown (= 0.6.9)
182182
html-pipeline-rouge_filter (~> 1.0)
183-
html-proofer (~> 2.6)
183+
html-proofer (~> 3.0)
184184
jekyll-auth (~> 2.0)
185185
jsonlint (= 0.1.0)
186186
nanoc (~> 4.0)
@@ -193,4 +193,4 @@ DEPENDENCIES
193193
selenium-webdriver (= 2.45.0)
194194

195195
BUNDLED WITH
196-
1.10.6
196+
1.11.2

‎Rakefile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@ end
3535

3636
desc "Run the HTML-Proofer"
3737
task :run_proofer do
38-
require 'html/proofer'
38+
require 'html-proofer'
3939
ignored_links = [%r{www.w3.org}]
40-
latest_ent_version = GitHub::Resources::Helpers::CONTENT['LATEST_ENTERPRISE_VERSION']
4140
# swap versionless Enterprise articles with versioned paths
42-
href_swap = {
43-
%r{help\.github\.com/enterprise/admin/} => "help.github.com/enterprise/#{config[:versions][0]}/admin/",
44-
%r{help\.github\.com/enterprise/user/} => "help.github.com/enterprise/#{config[:versions][0]}/user/"
41+
url_swap = {
42+
%r{help.github.com/enterprise/admin/} => "help.github.com/enterprise/#{config[:versions][0]}/admin/",
43+
%r{help.github.com/enterprise/user/} => "help.github.com/enterprise/#{config[:versions][0]}/user/"
4544
}
46-
HTML::Proofer.new("./output", \
47-
:href_ignore => ignored_links, \
48-
:href_swap => href_swap, \
49-
:parallel => { :in_processes => 5 }).run
45+
proofer_opts = {
46+
:url_ignore => ignored_links,
47+
:url_swap => url_swap,
48+
:parallel => { :in_processes => 5 }
49+
}
50+
HTMLProofer.check_directory("./output", proofer_opts).run
5051
end
5152

5253
desc "Remove the tmp dir"

‎vendor/cache/activesupport-4.2.5.2.gem‎

323 KB
Binary file not shown.

‎vendor/cache/activesupport-4.2.5.gem‎

-323 KB
Binary file not shown.

‎vendor/cache/ethon-0.8.0.gem‎

-53.5 KB
Binary file not shown.

‎vendor/cache/ethon-0.8.1.gem‎

54 KB
Binary file not shown.

‎vendor/cache/html-proofer-2.6.4.gem‎

-17 KB
Binary file not shown.

‎vendor/cache/html-proofer-3.0.2.gem‎

16 KB
Binary file not shown.

‎vendor/cache/minitest-5.8.3.gem‎

-70 KB
Binary file not shown.

0 commit comments

Comments
 (0)