Sync changes from upstream repository

Hubot · Hubot · commit 9462678b690f · 2015-12-10T15:38:55.000-08:00
diff --git a/Rules b/Rules
@@ -26,7 +26,6 @@ compile '/v3{.*,/**/*}' do
   filter :erb
   filter :html_pipeline, @config[:pipeline_config]
   filter :enterprise_only_filter
-  filter :not_enterprise_filter
   layout(item[:layout] ? "/#{item[:layout]}.*" : '/api.*')
 end
 
diff --git a/content/v3/orgs/teams.md b/content/v3/orgs/teams.md
@@ -192,7 +192,7 @@ authenticated user.
 
 ## Add team member
 
-{{#not-enterprise}}
+{% if page.version == 'dotcom' %}
 
 ### Deprecation notice
 
@@ -208,7 +208,7 @@ instead. It allows you to invite new organization members to your teams.
 
 {{/tip}}
 
-{{/not-enterprise}}
+{% endif %}
 
 In order to add a user to a team, the authenticated user must have
 'admin' permissions to the team or be an owner of the organization that the team
diff --git a/content/v3/pulls.md b/content/v3/pulls.md
@@ -234,4 +234,4 @@ use of media types in the API [here](/v3/media/).
 
 <a id="diff-error">
 
-If a diff is corrupt, <span class='not-enterprise'>please contact [GitHub Support](https://www.github.com/contact)</span><span class='enterprise-only'>contact your site administrator</span> to receive help. Be sure to include the repository name and pull request ID.
+If a diff is corrupt, contact {{ site.data.variables.contact.contact_support }} to receive help. Be sure to include the repository name and pull request ID.
diff --git a/content/v3/repos/releases.md b/content/v3/repos/releases.md
@@ -155,8 +155,8 @@ Users with push access to the repository can delete a release.
 
 This endpoint makes use of [a Hypermedia relation](/v3/#hypermedia) to determine which URL to access.
 This endpoint is provided by a URI template in [the release's API response](#get-a-single-release).
-<span class="not-enterprise">You need to use an HTTP client which supports
-<a href="http://en.wikipedia.org/wiki/Server_Name_Indication">SNI</a> to make calls to this endpoint.</span>
+{% if page.version == 'dotcom' %}You need to use an HTTP client which supports
+<a href="http://en.wikipedia.org/wiki/Server_Name_Indication">SNI</a> to make calls to this endpoint.{% endif %}
 
 The asset data is expected in its raw binary form, rather than JSON.
 Everything else about the endpoint is the same as the rest of the API. For example, you'll still need to pass your authentication to be able to upload an asset.
diff --git a/content/v3/search.md b/content/v3/search.md
@@ -135,7 +135,9 @@ Due to the complexity of searching code, there are a few restrictions on how sea
 <ul>
 <li>Only the <em>default branch</em> is considered. In most cases, this will be the <code>master</code> branch.</li>
 <li>Only files smaller than 384 KB are searchable.</li>
-<li class='not-enterprise'> You must always include at least one search term when searching source code. For example, searching for <a href="https://github.com/search?utf8=✓&q=language%3Ago&type=Code"><code>language:go</code></a> is not valid, while <a href="https://github.com/search?utf8=✓&q=amazing+language%3Ago&type=Code"><code>amazing language:go</code></a> is.</li>
+{% if page.version == 'dotcom' %}
+<li>You must always include at least one search term when searching source code. For example, searching for <a href="https://github.com/search?utf8=✓&q=language%3Ago&type=Code"><code>language:go</code></a> is not valid, while <a href="https://github.com/search?utf8=✓&q=amazing+language%3Ago&type=Code"><code>amazing language:go</code></a> is.</li>
+{% endif %}
 </ul>
 
 ### Parameters
diff --git a/data/variables/contact.yml b/data/variables/contact.yml
@@ -0,0 +1,6 @@
+contact_support:
+  {% if page.version == 'dotcom' %}
+  '[GitHub support](https://github.com/contact)'
+  {% else %}
+  'your GitHub Enterprise site administrator'
+  {% endif %}
diff --git a/layouts/sidebar.html b/layouts/sidebar.html
@@ -64,7 +64,9 @@ <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></
         <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></a><a href="/v3/orgs/">Organizations</a></h3>
         <ul class="js-guides">
           <li><a href="/v3/orgs/members/">Members</a></li>
-          <li class='not-enterprise'><a href="/v3/orgs/migrations/">Migrations</a></li>
+          {% if page.version == 'dotcom' %}
+          <li><a href="/v3/orgs/migrations/">Migrations</a></li>
+          {% endif %}
           <li><a href="/v3/orgs/teams/">Teams</a></li>
           <li><a href="/v3/orgs/hooks/">Webhooks</a></li>
         </ul>
diff --git a/lib/not-enterprise.rb b/lib/not-enterprise.rb
diff --git a/nanoc.yaml b/nanoc.yaml
@@ -19,6 +19,13 @@ versions:
   - 2.1
   - 2.0
 
+data_variables:
+  -
+    scope:
+      path: ""
+    values:
+      version: "dotcom"
+
 page_variables:
   -
     scope:

Original file line number	Diff line number	Diff line change
`@@ -234,4 +234,4 @@ use of media types in the API [here](/v3/media/).`
`234`	`234`
`235`	`235`	`<a id="diff-error">`
`236`	`236`
`237`		`-If a diff is corrupt, <span class='not-enterprise'>please contact [GitHub Support](https://www.github.com/contact)</span><span class='enterprise-only'>contact your site administrator</span> to receive help. Be sure to include the repository name and pull request ID.`
	`237`	`+If a diff is corrupt, contact {{ site.data.variables.contact.contact_support }} to receive help. Be sure to include the repository name and pull request ID.`