diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 1788af7f96..eddc1d7130 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -44,6 +44,7 @@ jobs: github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - name: Create pull request + id: create-pull uses: repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} @@ -70,6 +71,35 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} number: ${{ steps.find-pull-request.outputs.number }} + # There are cases where the branch becomes out-of-date in between the time this workflow began and when the pull request is created/updated + - name: Update branch + if: ${{ steps.find-pull-request.outputs.number }} + uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const mainHeadSha = await github.git.getRef({ + ...context.repo, + ref: 'heads/main' + }) + console.log(`heads/main sha: ${mainHeadSha.data.object.sha}`) + + const pull = await github.pulls.get({ + ...context.repo, + pull_number: parseInt(${{ steps.find-pull-request.outputs.number }}) + }) + console.log(`Pull request base sha: ${pull.data.base.sha}`) + + if (mainHeadSha.data.object.sha !== pull.data.base.sha || pull.data.mergeable_state === 'behind') { + const updateBranch = await github.pulls.updateBranch({ + ...context.repo, + pull_number: parseInt(${{ steps.find-pull-request.outputs.number }}) + }) + console.log(updateBranch.data.message) + } else { + console.log(`Branch is already up-to-date`) + } + - name: Send Slack notification if workflow fails uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd if: failure() diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0480575521..36f523c053 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -152,7 +152,7 @@ We (usually the docs team, but sometimes GitHub product managers, engineers, or You should always review your own PR first. For content changes, make sure that you: -- [ ] Confirm that the changes address every part of the content strategy plan from your issue (if there are differences, explain them). +- [ ] Confirm that the changes address every part of the content design plan from your issue (if there are differences, explain them). - [ ] Review the content for technical accuracy. - [ ] Review the entire pull request using the [localization checklist](contributing/localization-checklist.md). - [ ] Copy-edit the changes for grammar, spelling, and adherence to the style guide. diff --git a/app.json b/app.json index ce6f572a46..4373896fff 100644 --- a/app.json +++ b/app.json @@ -3,10 +3,9 @@ "env": { "NODE_ENV": "production", "NPM_CONFIG_PRODUCTION": "true", - "ENABLED_LANGUAGES": "en, de" + "ENABLED_LANGUAGES": "en" }, "buildpacks": [ - { "url": "https://github.com/DataDog/heroku-buildpack-datadog.git#1.21" }, { "url": "heroku/nodejs" } ], "formation": { diff --git a/content/developers/apps/creating-a-github-app-using-url-parameters.md b/content/developers/apps/creating-a-github-app-using-url-parameters.md index e2008f06bf..99d0f03a93 100644 --- a/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -79,8 +79,8 @@ Permission | Description [`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/rest/reference/repos#contents). Can be one of: `none`, `read`, or `write`. [`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/rest/reference/activity#starring). Can be one of: `none`, `read`, or `write`. [`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/rest/reference/repos#statuses). Can be one of: `none`, `read`, or `write`. -[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/rest/reference/teams#discussions) and the [Team Discussion Comments API](/rest/reference/teams#discussion-comments). Can be one of: `none`, `read`, or `write`. -`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. +[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/rest/reference/teams#discussions) and the [Team Discussion Comments API](/rest/reference/teams#discussion-comments). Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@1.19" %} +`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`.{% endif %} `watching` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. ### {% data variables.product.prodname_github_app %} webhook events diff --git a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 20826403c5..ae02a509fc 100644 --- a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -67,7 +67,7 @@ If the user accepts your request, GitHub redirects back to your site with a temp {% endnote %} -Exchange this `code` for an access token. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} When expiring tokens are enabled, the access token expires in 8 hours and the refresh token expires in 6 months. Every time you refresh the token, you get a new refresh token. For more information, see "[Refreshing user-to-server access tokens](/developers/apps/refreshing-user-to-server-access-tokens)." +Exchange this `code` for an access token. {% if currentVersion == "free-pro-team@latest" %} When expiring tokens are enabled, the access token expires in 8 hours and the refresh token expires in 6 months. Every time you refresh the token, you get a new refresh token. For more information, see "[Refreshing user-to-server access tokens](/developers/apps/refreshing-user-to-server-access-tokens)." Expiring user tokens are currently part of the user-to-server token expiration beta and subject to change. To opt-in to the user-to-server token expiration beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)."{% endif %} diff --git a/content/developers/apps/suspending-a-github-app-installation.md b/content/developers/apps/suspending-a-github-app-installation.md index ac4cf127d3..34b6df1e3b 100644 --- a/content/developers/apps/suspending-a-github-app-installation.md +++ b/content/developers/apps/suspending-a-github-app-installation.md @@ -7,13 +7,11 @@ versions: free-pro-team: '*' --- -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Note:** {% data reusables.pre-release-program.suspend-installation-beta %} {% endnote %} -{% endif %} ### Suspending a GitHub App diff --git a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md index 9252c41ece..342754e94d 100644 --- a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md +++ b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md @@ -4,6 +4,5 @@ intro: 'You can list free and paid tools for developers to use in {% data variab mapTopic: true versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md b/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md index aa9d924b49..8e76577810 100644 --- a/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md +++ b/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md @@ -48,7 +48,7 @@ Customers can start a free trial for any paid plan on a Marketplace listing that Free trials have a fixed length of 14 days. Customers are notified 4 days before the end of their trial period (on day 11 of the free trial) that their plan will be upgraded. At the end of a free trial, customers will be auto-enrolled into the plan they are trialing if they do not cancel. -For more information, see: "[Handling new purchases and free trials](/developers/github-marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/)." +For more information, see: "[Handling new purchases and free trials](/developers/github-marketplace/handling-new-purchases-and-free-trials/)." {% note %} diff --git a/content/developers/github-marketplace/requirements-for-listing-an-app.md b/content/developers/github-marketplace/requirements-for-listing-an-app.md index e54424b74a..39b4c2dc99 100644 --- a/content/developers/github-marketplace/requirements-for-listing-an-app.md +++ b/content/developers/github-marketplace/requirements-for-listing-an-app.md @@ -53,7 +53,7 @@ In addition to the requirements for all apps above, each app that you offer as a - {% data variables.product.prodname_github_app %}s should have a minimum of 100 installations. - {% data variables.product.prodname_oauth_app %}s should have a minimum of 200 users. - All paid apps must handle {% data variables.product.prodname_marketplace %} purchase events for new purchases, upgrades, downgrades, cancellations, and free trials. For more information, see "[Billing requirements for paid apps](#billing-requirements-for-paid-apps)" below. -- Publishing organizations must have a verified domain and must enable two-factor authentication. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.") +- Publishing organizations must have a verified domain and must enable two-factor authentication. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)." When you are ready to publish the app on {% data variables.product.prodname_marketplace %} you must request verification for the listing. diff --git a/content/developers/overview/managing-deploy-keys.md b/content/developers/overview/managing-deploy-keys.md index b1c958c590..d97cec6391 100644 --- a/content/developers/overview/managing-deploy-keys.md +++ b/content/developers/overview/managing-deploy-keys.md @@ -44,7 +44,9 @@ If you don't want to use SSH keys, you can use [HTTPS with OAuth tokens][git-aut * Users don't have to change their local SSH settings. * Multiple tokens (one for each user) are not needed; one token per server is enough. * A token can be revoked at any time, turning it essentially into a one-use password. +{% if enterpriseServerVersions contains currentVersion %} * Generating new tokens can be easily scripted using [the OAuth API](/rest/reference/oauth-authorizations#create-a-new-authorization). +{% endif %} ##### Cons diff --git a/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 58c722f5b7..c5e7d4cd6b 100644 --- a/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -430,7 +430,7 @@ Key | Type | Description {% endnote %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} +{% if currentVersion == "free-pro-team@latest" %} {% note %} **Note:** {% data reusables.pre-release-program.suspend-installation-beta %} For more information, see "[Suspending a {% data variables.product.prodname_github_app %} installation](/apps/managing-github-apps/suspending-a-github-app-installation/)." @@ -1124,9 +1124,11 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.secret_scanning_alert.reopened }} {% endif %} +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@1.19" %} ### security_advisory Activity related to a security advisory. A security advisory provides information about security-related vulnerabilities in software on GitHub. The security advisory dataset also powers the GitHub security alerts, see "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies/)." +{% endif %} #### Availability diff --git a/content/github/authenticating-to-github/authorizing-oauth-apps.md b/content/github/authenticating-to-github/authorizing-oauth-apps.md index a63b81f180..dca4ac4c69 100644 --- a/content/github/authenticating-to-github/authorizing-oauth-apps.md +++ b/content/github/authenticating-to-github/authorizing-oauth-apps.md @@ -38,7 +38,7 @@ When an {% data variables.product.prodname_oauth_app %} wants to identify you by *Scopes* are named groups of permissions that an {% data variables.product.prodname_oauth_app %} can request to access both public and non-public data. -When you want to use an {% data variables.product.prodname_oauth_app %} that integrates with {% data variables.product.product_name %}, that app lets you know what type of access to your data will be required. If you grant access to the app, then the app will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](//apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)." +When you want to use an {% data variables.product.prodname_oauth_app %} that integrates with {% data variables.product.product_name %}, that app lets you know what type of access to your data will be required. If you grant access to the app, then the app will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](/apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)." {% tip %} diff --git a/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/content/github/authenticating-to-github/connecting-with-third-party-applications.md index e792daf5ec..5af7c4e731 100644 --- a/content/github/authenticating-to-github/connecting-with-third-party-applications.md +++ b/content/github/authenticating-to-github/connecting-with-third-party-applications.md @@ -32,7 +32,7 @@ Applications can have *read* or *write* access to your {% data variables.product *Scopes* are named groups of permissions that an application can request to access both public and non-public data. -When you want to use a third-party application that integrates with {% data variables.product.product_name %}, that application lets you know what type of access to your data will be required. If you grant access to the application, then the application will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](//apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)." +When you want to use a third-party application that integrates with {% data variables.product.product_name %}, that application lets you know what type of access to your data will be required. If you grant access to the application, then the application will be able to perform actions on your behalf, such as reading or modifying data. For example, if you want to use an app that requests `user:email` scope, the app will have read-only access to your private email addresses. For more information, see "[About scopes for {% data variables.product.prodname_oauth_app %}s](/apps/building-integrations/setting-up-and-registering-oauth-apps/about-scopes-for-oauth-apps)." {% tip %} diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 3c26119a81..79fdf066f1 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -53,7 +53,7 @@ On Windows, the `codeql-runner-win.exe` file usually requires no change to permi Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: ```shell -wget https://github.com/github/codeql-action/releases/download/codeql-bundle-20200826/codeql-runner-linux +wget https://github.com/github/codeql-action/releases/latest/download/codeql-runner-linux chmod +x codeql-runner-linux ``` @@ -127,7 +127,7 @@ This example is similar to the previous example, however this time the repositor > ... > CodeQL environment output to "/srv/checkout/example-repo-2/codeql-runner/codeql-env.json" and "/srv/checkout/example-repo-2/codeql-runner/codeql-env.sh". - Please export these variables to future processes so the build can be traced, for example by running " + Please export these variables to future processes so that CodeQL can monitor the build, for example by running " . /srv/checkout/example-repo-2/codeql-runner/codeql-env.sh". ``` diff --git a/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index e1a631af52..a0a9f79168 100644 --- a/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -11,7 +11,7 @@ To help you understand your subscriptions and decide whether to unsubscribe, see {% note %} -**Note:** Instead of unsubscribing, you have the option to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you're experiencing abuse and want to ignore a repository, please [contact support](/contact) so we can help. {% data reusables.policies.abuse %}{% endif %} +**Note:** Instead of unsubscribing, you have the option to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you're experiencing abuse and want to ignore a repository, please contact {% data variables.contact.contact_support %} so we can help. {% data reusables.policies.abuse %}{% endif %} {% endnote %} diff --git a/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md b/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md index 831b6f6936..716fb5541a 100644 --- a/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md +++ b/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md @@ -39,7 +39,7 @@ You can also watch and unwatch releases in a repository. For more information, s {% note %} -**Note:** You can also choose to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you experiencing abuse and want to ignore a repository, please [contact support](/contact) so we can help. {% data reusables.policies.abuse %}{% endif %} +**Note:** You can also choose to ignore a repository. If you ignore a repository, you won't receive any notifications. We don't recommend ignoring repositories as you won't be notified if you're @mentioned. {% if currentVersion == "free-pro-team@latest" %}If you experiencing abuse and want to ignore a repository, please contact {% data variables.contact.contact_support %} so we can help. {% data reusables.policies.abuse %}{% endif %} {% endnote %} diff --git a/content/github/searching-for-information-on-github/searching-code.md b/content/github/searching-for-information-on-github/searching-code.md index a7fc87e911..f03e26fb17 100644 --- a/content/github/searching-for-information-on-github/searching-code.md +++ b/content/github/searching-for-information-on-github/searching-code.md @@ -27,7 +27,8 @@ Due to the complexity of searching code, there are some restrictions on how sear - Only the _default branch_ is indexed for code search.{% if currentVersion == "free-pro-team@latest" %} - Only files smaller than 384 KB are searchable.{% else %}* Only files smaller than 5 MB are searchable. - Only the first 500 KB of each file is searchable.{% endif %} -- Only repositories with fewer than 500,000 files are searchable. +- Only repositories with fewer than 500,000 files are searchable.{% if currentVersion == "free-pro-team@latest" %} +- Only repositories that have had activity or have been returned in search results in the last year are searchable.{% endif %} - Except with [`filename`](#search-by-filename) searches, you must always include at least one search term when searching source code. For example, searching for [`language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=language%3Ajavascript&type=Code&ref=searchresults) is not valid, while [`amazing language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=amazing+language%3Ajavascript&type=Code&ref=searchresults) is. - At most, search results can show two fragments from the same file, but there may be more results within the file. - You can't use the following wildcard characters as part of your search query: . , : ; / \ ` ' " = * ! ? # $ & + ^ | ~ < > ( ) { } [ ]. The search will simply ignore these symbols. diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index 52a69a7135..70d4eb12aa 100644 --- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -4,8 +4,11 @@ intro: '{% data variables.product.prodname_insights %} analyzes your {% data var product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization + - /enterprise-server@2.22/github/site-policy/github-insights-and-data-protection-for-your-organization + - /enterprise-server@2.21/github/site-policy/github-insights-and-data-protection-for-your-organization + - /enterprise-server@2.20/github/site-policy/github-insights-and-data-protection-for-your-organization versions: - enterprise-server: '*' + free-pro-team: '*' --- For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement. diff --git a/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md index 110de95ccc..d80bbd16cc 100644 --- a/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md +++ b/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md @@ -216,8 +216,6 @@ c/o Corporation Service Company Sacramento, CA 95833-3505 ``` -You may also send a courtesy copy to legal@support.github.com. - Please make your requests as specific and narrow as possible, including the following information: - Full information about authority issuing the request for information diff --git a/content/graphql/reference/enums.md b/content/graphql/reference/enums.md index f87cc2e4cc..50ff25548c 100644 --- a/content/graphql/reference/enums.md +++ b/content/graphql/reference/enums.md @@ -2,6 +2,7 @@ title: Enums redirect_from: - /v4/enum + - /v4/reference/enum versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/input-objects.md b/content/graphql/reference/input-objects.md index 423c6511c8..ad927ff2bb 100644 --- a/content/graphql/reference/input-objects.md +++ b/content/graphql/reference/input-objects.md @@ -2,6 +2,7 @@ title: Input objects redirect_from: - /v4/input_object + - /v4/reference/input_object versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/interfaces.md b/content/graphql/reference/interfaces.md index bfc411d796..492e7b535c 100644 --- a/content/graphql/reference/interfaces.md +++ b/content/graphql/reference/interfaces.md @@ -2,6 +2,7 @@ title: Interfaces redirect_from: - /v4/interface + - /v4/reference/interface versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/mutations.md b/content/graphql/reference/mutations.md index e42955c3d3..387dcd51ac 100644 --- a/content/graphql/reference/mutations.md +++ b/content/graphql/reference/mutations.md @@ -2,6 +2,7 @@ title: Mutations redirect_from: - /v4/mutation + - /v4/reference/mutation versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/objects.md b/content/graphql/reference/objects.md index 345786d5e1..7872b01baa 100644 --- a/content/graphql/reference/objects.md +++ b/content/graphql/reference/objects.md @@ -2,6 +2,7 @@ title: Objects redirect_from: - /v4/object + - /v4/reference/object versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/queries.md b/content/graphql/reference/queries.md index a2cc6af7b1..48b714cd4b 100644 --- a/content/graphql/reference/queries.md +++ b/content/graphql/reference/queries.md @@ -3,6 +3,7 @@ title: Queries miniTocMaxHeadingLevel: 2 redirect_from: - /v4/query + - /v4/reference/query versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/scalars.md b/content/graphql/reference/scalars.md index 338b4f42c7..2863a61f0d 100644 --- a/content/graphql/reference/scalars.md +++ b/content/graphql/reference/scalars.md @@ -2,6 +2,7 @@ title: Scalars redirect_from: - /v4/scalar + - /v4/reference/scalar versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/graphql/reference/unions.md b/content/graphql/reference/unions.md index 5a87c63fc0..2c9b6a7862 100644 --- a/content/graphql/reference/unions.md +++ b/content/graphql/reference/unions.md @@ -2,6 +2,7 @@ title: Unions redirect_from: - /v4/union + - /v4/reference/union versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md index ee319fad22..90bf3a0747 100644 --- a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md @@ -19,4 +19,4 @@ You can choose which contributors are included in metrics and create teams of co ### Further reading - "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)" -- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)" +- "{% data variables.product.prodname_insights %} and data protection for your organization" \ No newline at end of file diff --git a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md index 228c43c784..5bc8e0c745 100644 --- a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md @@ -108,4 +108,4 @@ To configure {% data variables.product.prodname_insights %} to connect to {% dat ### Further reading - "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)" -- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)" +- "{% data variables.product.prodname_insights %} and data protection for your organization" diff --git a/content/rest/overview/libraries.md b/content/rest/overview/libraries.md index f72b9b3b65..68c9ab862b 100644 --- a/content/rest/overview/libraries.md +++ b/content/rest/overview/libraries.md @@ -7,6 +7,7 @@ redirect_from: versions: free-pro-team: '*' enterprise-server: '*' + github-ae: '*' ---
diff --git a/content/rest/reference/enterprise-admin.md b/content/rest/reference/enterprise-admin.md index a35266becc..1f8fda8b12 100644 --- a/content/rest/reference/enterprise-admin.md +++ b/content/rest/reference/enterprise-admin.md @@ -40,7 +40,7 @@ http(s)://hostname/ {% if currentVersion == "github-ae@latest" or enterpriseServerVersions contains currentVersion %} ### Authentication -Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} +Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** {% if enterpriseServerVersions contains currentVersion %}(which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) {% endif %}or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} Enterprise administration API endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators{% if enterpriseServerVersions contains currentVersion %}, except for the [Management Console](#management-console) API, which requires the [Management Console password](/enterprise/admin/articles/accessing-the-management-console/){% endif %}. diff --git a/data/reusables/pre-release-program/suspend-installation-beta.md b/data/reusables/pre-release-program/suspend-installation-beta.md index 42ef3db1bc..2bab45542f 100644 --- a/data/reusables/pre-release-program/suspend-installation-beta.md +++ b/data/reusables/pre-release-program/suspend-installation-beta.md @@ -1,4 +1 @@ -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} Suspending a {% data variables.product.prodname_github_app %} installation is currently in beta and subject to change. Before you can suspend a {% data variables.product.prodname_github_app %}, the app owner must enable suspending installations for the app by opting-in to the beta. To opt-in to the suspending installations beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)." - -{% endif %} diff --git a/includes/breadcrumbs.html b/includes/breadcrumbs.html index 47dc43c17a..9fdc33acc4 100644 --- a/includes/breadcrumbs.html +++ b/includes/breadcrumbs.html @@ -3,7 +3,7 @@ {% if breadcrumb[1].href == '' %} {{breadcrumb[1].title}} {% else %} - + {{breadcrumb[1].title}} {% endif %} {% endfor %} diff --git a/includes/sidebar-guides.html b/includes/sidebar-guides.html index c24e084944..ef2e81b62b 100644 --- a/includes/sidebar-guides.html +++ b/includes/sidebar-guides.html @@ -1,17 +1,17 @@