Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit 302719b

Browse files
gjtorikiangjtorikian
committed
Merge branch 'master' into update-search-logic
2 parents 55aa479 + d812373 commit 302719b

107 files changed

Lines changed: 148 additions & 1333 deletions

File tree

Some content is hidden

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

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.2.3

‎README.md‎

Lines changed: 28 additions & 18 deletions

‎Rakefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
require_relative 'lib/resources'
22
require 'tmpdir'
33

4+
Dir.glob('tasks/**/*.rake').each { |r| load r }
5+
46
task :default => [:test]
57

68
desc 'Builds the site'
@@ -28,8 +30,8 @@ task :run_proofer do
2830
latest_ent_version = GitHub::Resources::Helpers::CONTENT['LATEST_ENTERPRISE_VERSION']
2931
# swap versionless Enterprise articles with versioned paths
3032
href_swap = {
31-
%r{help\.github\.com/enterprise/admin/} => "help.github.com/enterprise/#{latest_ent_version}/admin/",
32-
%r{help\.github\.com/enterprise/user/} => "help.github.com/enterprise/#{latest_ent_version}/user/"
33+
%r{help\.github\.com/enterprise/admin/} => "help.github.com/enterprise/#{config[:versions][0]}/admin/",
34+
%r{help\.github\.com/enterprise/user/} => "help.github.com/enterprise/#{config[:versions][0]}/user/"
3335
}
3436
HTML::Proofer.new("./output", :href_ignore => ignored_links, :href_swap => href_swap).run
3537
end

‎Rules‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ end
1212

1313
passthrough '/CNAME'
1414

15-
compile '/feed.*' do
15+
compile '/changes.atom' do
1616
filter :erb
17-
filter :html_pipeline, @config[:pipeline_config]
1817
end
1918

2019
compile '/integrations-directory/*' do
@@ -60,7 +59,7 @@ compile '/**/*' do
6059
layout(item[:layout] ? "/#{item[:layout]}.*" : '/default.*')
6160
end
6261

63-
route '/feed.*' do
62+
route '/changes.atom' do
6463
'/changes.atom'
6564
end
6665

‎changes.atom‎

Lines changed: 0 additions & 1201 deletions
This file was deleted.

content/feed.atom renamed to content/changes.atom

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ author_name: technoweenie
55
author_uri: https://github.com/technoweenie
66
layout: false
77
---
8-
98
<%= atom_feed :limit => 30, :articles => api_changes %>

‎content/changes/2014-06-23-the-github-enterprise-api-documentation-has-a-new-home.md‎

Lines changed: 1 addition & 1 deletion

‎content/changes/2014-08-05-team-memberships-api.md‎

Lines changed: 1 addition & 1 deletion

‎content/changes/2014-08-28-accepting-organization-invitations-from-the-api.md‎

Lines changed: 1 addition & 1 deletion

‎content/guides/automating-deployments-to-integrators.md‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)