Skip to content

Commit

Permalink
Merge pull request #16022 from github/repo-sync
Browse files Browse the repository at this point in the history
repo sync
  • Loading branch information
Octomerger authored Mar 3, 2022
2 parents 2be6d3e + 693fb35 commit 86c5c84
Show file tree
Hide file tree
Showing 56 changed files with 460 additions and 145 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Filtering files in a pull request
intro: 'To help you quickly review changes in a large pull request, you can filter changed files.'
intro: 'To help you quickly review changes in a large pull request, you can filter changed files{% if pr-tree-view %} or use the file tree to navigate between files{% endif %}.'
redirect_from:
- /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request
- /articles/filtering-files-in-a-pull-request-by-file-type
Expand All @@ -16,7 +16,9 @@ topics:
- Pull requests
shortTitle: Filter files
---
You can filter files in a pull request by file extension type, such as `.html` or `.js`, lack of an extension, code ownership, or dotfiles.
You can filter files in a pull request by file extension type, such as `.html` or `.js`, lack of an extension, code ownership, or dotfiles.{% if pr-tree-view %} You can also use the file tree to filter by file path, navigate between files, or see a high level view of the changed files.{% endif %}

## Using the file filter dropdown

{% tip %}

Expand All @@ -32,6 +34,26 @@ You can filter files in a pull request by file extension type, such as `.html` o
5. Optionally, to clear the filter selection, under the **Files changed** tab, click **Clear**.
![Clear file filter selection](/assets/images/help/pull_requests/clear-file-filter.png)

{% if pr-tree-view %}
## Using the file tree

{% data reusables.repositories.sidebar-pr %}
1. In the list of pull requests, click the pull request you'd like to filter.
{% data reusables.repositories.changed-files %}
1. If the file tree is hidden, click **Show file tree** to display the file tree.

{% note %}

**Note**: The file tree will not display if your screen width is too narrow or if the pull request only includes one file.

{% endnote %}

1. Click on a file in the file tree to view the corresponding file diff.
![Pull request file tree](/assets/images/help/pull_requests/pr-file-tree.png)
1. To filter by file path, enter part or all of the file path in the **Filter changed files** search box. Alternatively, use the file filter dropdown. For more information, see "[Using the file filter dropdown](#using-the-file-filter-dropdown)."

{% endif %}

## Further reading

- "[About comparing branches in a pull request](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ You can review changes in a pull request one file at a time. While reviewing the

You can also choose to hide whitespace differences. The choice you make only applies to this pull request and will be remembered the next time you visit this page.
{% endif %}
1. Optionally, filter the files to show only the files you want to review{% if pr-tree-view %} or use the file tree to navigate to a specific file{% endif %}. For more information, see "[Filtering files in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)."
{% data reusables.repositories.start-line-comment %}
{% data reusables.repositories.type-line-comment %}
{% data reusables.repositories.suggest-changes %}
Expand Down
17 changes: 1 addition & 16 deletions content/rest/overview/endpoints-available-for-github-apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,4 @@ topics:
shortTitle: GitHub App-enabled endpoints
---

You must use an installation access token to access endpoints using your {% data variables.product.prodname_github_app %}. For more information, see "[Authenticating with {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-an-installation)."

{% for thing in rest.operationsEnabledForGitHubApps[currentVersion] %}
{% assign category = thing[0] %}
{% assign operations = thing[1] %}
{% if operations.size > 0 %}
<h3 id="{{category}}">
<a href="#{{category}}">{{ category }}</a>
</h3>
<ul>
{% for operation in operations %}
<li><a href="/{{currentLanguage}}/rest/reference/{{operation.category}}#{{operation.slug}}"><code><span style="text-transform: uppercase">{{operation.verb}}</span> {{operation.requestPath}}</code></a></li>
{% endfor %}
</ul>
{% endif %}
{% endfor %}
**The content of this page is rendered as a NextJS page component.**
7 changes: 7 additions & 0 deletions data/features/pr-tree-view.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Issue 5892
# PR file tree view
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.5'
ghae: 'issue-5892'
14 changes: 14 additions & 0 deletions data/release-notes/enterprise-server/3-1/18.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
date: '2022-03-01'
sections:
bugs:
- Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
- OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.1/rest/reference/apps#check-an-authorization) API endpoint.
known_issues:
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- Custom firewall rules are removed during the upgrade process.
- Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
- Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search github.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in github.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
13 changes: 13 additions & 0 deletions data/release-notes/enterprise-server/3-2/10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
date: '2022-03-01'
sections:
bugs:
- Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
- OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.2/rest/reference/apps#check-an-authorization) API endpoint.
known_issues:
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- Custom firewall rules are removed during the upgrade process.
- Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
- Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search github.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in github.com search results.
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
14 changes: 14 additions & 0 deletions data/release-notes/enterprise-server/3-3/18.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
date: '2022-03-01'
sections:
bugs:
- Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
- OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.1/rest/reference/apps#check-an-authorization) API endpoint.
known_issues:
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- Custom firewall rules are removed during the upgrade process.
- Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
- Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search github.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in github.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
15 changes: 15 additions & 0 deletions data/release-notes/enterprise-server/3-3/5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
date: '2022-03-01'
sections:
bugs:
- Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
- OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.3/rest/reference/apps#check-an-authorization) API endpoint.
known_issues:
- After upgrading to {% data variables.product.prodname_ghe_server %} 3.3, {% data variables.product.prodname_actions %} may fail to start automatically. To resolve this issue, connect to the appliance via SSH and run the `ghe-actions-start` command.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- Custom firewall rules are removed during the upgrade process.
- Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
- Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search github.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in github.com search results.
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% note %}

**Note:** Dependabot security updates and version updates are currently available for {% data variables.product.prodname_ghe_cloud %} and in beta for {% data variables.product.prodname_ghe_server %} 3.3. To request access to the beta release, [contact your account management team](https://enterprise.github.com/contact).
**Note:** Dependabot security updates and version updates are currently available for {% data variables.product.prodname_ghe_cloud %} and in beta for {% data variables.product.prodname_ghe_server %} 3.3. Please [contact your account management team](https://enterprise.github.com/contact) for instructions on enabling Dependabot updates.

{% endnote %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% if dependabot-updates-github-connect %}
**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in public beta and subject to change.
{% else %}
**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in private beta and subject to change. To request access to the beta release, [contact your account management team](https://enterprise.github.com/contact).
**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in private beta and subject to change. Please [contact your account management team](https://enterprise.github.com/contact) for instructions on enabling Dependabot updates.
{% endif %}
{% endnote %}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { GetServerSideProps } from 'next'
import { useRouter } from 'next/router'
import { MainContextT, MainContext, getMainContext } from 'components/context/MainContext'
import {
getArticleContextFromRequest,
ArticleContextT,
ArticleContext,
} from 'components/context/ArticleContext'
import { ArticlePage } from 'components/article/ArticlePage'
import { Link } from 'components/Link'
import { getEnabledForApps } from 'lib/rest/index.js'

type OperationT = {
Expand All @@ -27,31 +29,27 @@ let enabledForApps: AppDataT | null = null
type Props = {
mainContext: MainContextT
enabledForApps: EnabledAppCategoryT
userLanguage: string
articleContext: ArticleContextT
}

export default function Category({
mainContext,
enabledForApps,
userLanguage,
articleContext,
}: Props) {
const content = Object.keys(enabledForApps).map((category: string, index: Number) => (
<div key={`enabledAppCategory-${index}`}>
{enabledForApps[category].length > 0 ? (
export default function Category({ mainContext, enabledForApps, articleContext }: Props) {
const { locale } = useRouter()

const content = Object.entries(enabledForApps).map(([category, operations]) => (
<div key={`enabledAppCategory-${category}`}>
{operations.length > 0 && (
<h3 id={category}>
<a href={category}>{category}</a>
<Link href={`/${locale}/rest/reference/${category}`}>{category}</Link>
</h3>
) : null}
)}
<ul>
{enabledForApps[category].map((operation: OperationT, index: Number) => (
<li key={`enabledAppOperation-${index}`}>
<a href={`${userLanguage}/rest/reference/${category}#${operation.slug}`}>
{operations.map((operation) => (
<li key={`enabledAppOperation-${operation.slug}`}>
<Link href={`/${locale}/rest/reference/${category}#${operation.slug}`}>
<code>
<span className="text-uppercase">{operation.verb}</span> {operation.requestPath}
</code>
</a>
</Link>
</li>
))}
</ul>
Expand All @@ -72,7 +70,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (context) =>
const res = context.res as object
const currentVersion = context.query.versionId as string
const mainContext = getMainContext(req, res)
const userLanguage = context.locale || ''

if (!enabledForApps) {
enabledForApps = (await getEnabledForApps()) as AppDataT
Expand All @@ -82,7 +79,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (context) =>
props: {
mainContext,
enabledForApps: enabledForApps[currentVersion],
userLanguage,
articleContext: getArticleContextFromRequest(req),
},
}
Expand Down
4 changes: 2 additions & 2 deletions tests/rendering/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ describe('REST references docs', () => {
const schemaSlugs = []
// using the static file, generate the expected slug for each operation
for (const [key, value] of Object.entries(enableForApps[version])) {
schemaSlugs.push(...value.map((item) => `en/rest/reference/${key}#${item.slug}`))
schemaSlugs.push(...value.map((item) => `/en/rest/reference/${key}#${item.slug}`))
}
// get all of the href attributes in the anchor tags
const $ = await getDOM(`/en/${version}/rest/overview/endpoints-available-for-github-apps`)
const domH3Ids = $('a')
const domH3Ids = $('#article-contents a')
.map((i, a) => $(a).attr('href'))
.get()
expect(schemaSlugs.every((slug) => domH3Ids.includes(slug))).toBe(true)
Expand Down
1 change: 1 addition & 0 deletions translations/log/cn-resets.csv
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ translations/zh-CN/content/billing/managing-billing-for-your-github-account/inde
translations/zh-CN/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md,parsing error
translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md,broken liquid tags
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md,broken liquid tags
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md,parsing error
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md,parsing error
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md,broken liquid tags
translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md,broken liquid tags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ shortTitle: 管理运行器组
![添加运行器组](/assets/images/help/settings/actions-enterprise-account-add-runner-group.png)
1. 输入运行程序组的名称,并分配组织访问策略。

您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下,只有私有仓库可以访问运行器组中的运行器,但您可以覆盖此设置。 This setting can't be overridden if configuring an organization's runner group that was shared by an enterprise.
您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下,只有私有仓库可以访问运行器组中的运行器,但您可以覆盖此设置。 如果配置企业共享的组织的运行组,则不能覆盖此设置。

{% warning %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ You can define inputs and secrets, which can be passed from the caller workflow
runs-on: ubuntu-latest
environment: production
steps:
- uses: ./.github/actions/my-action
- uses: ./.github/workflows/my-action
with:
username: ${{ inputs.username }}
token: ${{ secrets.envPAT }}
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
name: Pass input and secrets to my-action
runs-on: ubuntu-latest
steps:
- uses: ./.github/actions/my-action
- uses: ./.github/workflows/my-action
with:
username: ${{ inputs.username }}
token: ${{ secrets.token }}
Expand Down
Loading

0 comments on commit 86c5c84

Please sign in to comment.