FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Sync changes from upstream repository · github/developer.github.com@9462678 · GitHub

This repository was archived by the owner on Nov 1, 2017. It is now read-only.
/ developer.github.com Public archive

Commit 9462678

Browse files
Hubot
committed
Sync changes from upstream repository
1 parent 3f97603 commit 9462678

9 files changed

Lines changed: 24 additions & 27 deletions

File tree

‎Rules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ compile '/v3{.*,/**/*}' do
2626
filter :erb
2727
filter :html_pipeline, @config[:pipeline_config]
2828
filter :enterprise_only_filter
29-
filter :not_enterprise_filter
3029
layout(item[:layout] ? "/#{item[:layout]}.*" : '/api.*')
3130
end
3231

‎content/v3/orgs/teams.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ authenticated user.
192192

193193
## Add team member
194194

195-
{{#not-enterprise}}
195+
{% if page.version == 'dotcom' %}
196196

197197
### Deprecation notice
198198

@@ -208,7 +208,7 @@ instead. It allows you to invite new organization members to your teams.
208208

209209
{{/tip}}
210210

211-
{{/not-enterprise}}
211+
{% endif %}
212212

213213
In order to add a user to a team, the authenticated user must have
214214
'admin' permissions to the team or be an owner of the organization that the team

‎content/v3/pulls.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,4 @@ use of media types in the API [here](/v3/media/).
234234

235235
<a id="diff-error">
236236

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.

‎content/v3/repos/releases.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ Users with push access to the repository can delete a release.
155155

156156
This endpoint makes use of [a Hypermedia relation](/v3/#hypermedia) to determine which URL to access.
157157
This endpoint is provided by a URI template in [the release's API response](#get-a-single-release).
158-
<span class="not-enterprise">You need to use an HTTP client which supports
159-
<a href="http://en.wikipedia.org/wiki/Server_Name_Indication">SNI</a> to make calls to this endpoint.</span>
158+
{% if page.version == 'dotcom' %}You need to use an HTTP client which supports
159+
<a href="http://en.wikipedia.org/wiki/Server_Name_Indication">SNI</a> to make calls to this endpoint.{% endif %}
160160

161161
The asset data is expected in its raw binary form, rather than JSON.
162162
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.

‎content/v3/search.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ Due to the complexity of searching code, there are a few restrictions on how sea
135135
<ul>
136136
<li>Only the <em>default branch</em> is considered. In most cases, this will be the <code>master</code> branch.</li>
137137
<li>Only files smaller than 384 KB are searchable.</li>
138-
<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>
138+
{% if page.version == 'dotcom' %}
139+
<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>
140+
{% endif %}
139141
</ul>
140142

141143
### Parameters

‎data/variables/contact.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
contact_support:
2+
{% if page.version == 'dotcom' %}
3+
'[GitHub support](https://github.com/contact)'
4+
{% else %}
5+
'your GitHub Enterprise site administrator'
6+
{% endif %}

‎layouts/sidebar.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></
6464
<h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></a><a href="/v3/orgs/">Organizations</a></h3>
6565
<ul class="js-guides">
6666
<li><a href="/v3/orgs/members/">Members</a></li>
67-
<li class='not-enterprise'><a href="/v3/orgs/migrations/">Migrations</a></li>
67+
{% if page.version == 'dotcom' %}
68+
<li><a href="/v3/orgs/migrations/">Migrations</a></li>
69+
{% endif %}
6870
<li><a href="/v3/orgs/teams/">Teams</a></li>
6971
<li><a href="/v3/orgs/hooks/">Webhooks</a></li>
7072
</ul>

‎lib/not-enterprise.rb‎

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

‎nanoc.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ versions:
1919
- 2.1
2020
- 2.0
2121

22+
data_variables:
23+
-
24+
scope:
25+
path: ""
26+
values:
27+
version: "dotcom"
28+
2229
page_variables:
2330
-
2431
scope:

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL