diff --git a/assets/images/help/copilot/code-reference-dotcom.png b/assets/images/help/copilot/code-reference-dotcom.png new file mode 100644 index 000000000000..184d5ff3592d Binary files /dev/null and b/assets/images/help/copilot/code-reference-dotcom.png differ diff --git a/assets/images/help/desktop/appearance-tab-themes.png b/assets/images/help/desktop/appearance-tab-themes.png index 59a131b47b94..9736523c3401 100644 Binary files a/assets/images/help/desktop/appearance-tab-themes.png and b/assets/images/help/desktop/appearance-tab-themes.png differ diff --git a/assets/images/help/desktop/mac-select-git-pane.png b/assets/images/help/desktop/mac-select-git-pane.png index d22bb5ad7eee..63217adaaaa6 100644 Binary files a/assets/images/help/desktop/mac-select-git-pane.png and b/assets/images/help/desktop/mac-select-git-pane.png differ diff --git a/assets/images/help/desktop/mac-select-integrations-pane.png b/assets/images/help/desktop/mac-select-integrations-pane.png index 596fd8949d4e..35a5d3c25770 100644 Binary files a/assets/images/help/desktop/mac-select-integrations-pane.png and b/assets/images/help/desktop/mac-select-integrations-pane.png differ diff --git a/content/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners.md b/content/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners.md index 609ba68be3ba..31fd624756a5 100644 --- a/content/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners.md +++ b/content/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners.md @@ -23,14 +23,14 @@ topics: Using {% data variables.product.prodname_actions %} runners allows you to more easily identify {% data variables.product.prodname_dependabot %} job errors and manually detect and troubleshoot failed runs. You can also integrate {% data variables.product.prodname_dependabot %} into your CI/CD pipelines by using {% data variables.product.prodname_actions %} APIs and webhooks to detect {% data variables.product.prodname_dependabot %} job status such as failed runs, and perform downstream processing. For more information, see "[AUTOTITLE](/rest/actions)" and "[AUTOTITLE](/webhooks/webhook-events-and-payloads)." +>[!TIP] Running {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_dotcom %}-hosted and self-hosted runners **does not** count towards your included {% data variables.product.prodname_actions %} minutes. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)." + You can run {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} using: * {% data variables.product.prodname_dotcom %}-hosted runners * {% data variables.actions.hosted_runners_caps %}. These runners are {% data variables.product.prodname_dotcom %}-hosted, with advanced features, such as more RAM, CPU, and disk space. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners)." * Self-hosted runners -Using private networking with either an Azure Virtual Network (VNET) or Actions Runner Controller (ARC) is not supported. - ->[!TIP] Running {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_dotcom %}-hosted and self-hosted runners **does not** count towards your included {% data variables.product.prodname_actions %} minutes. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)." +{% data reusables.dependabot.vnet-arc-note %} Enabling {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} may increase the number of concurrent jobs run in your account. If required, customers on enterprise plans can request a higher limit for concurrent jobs. For more information, contact us through the {% data variables.contact.contact_support_portal %}, or contact your sales representative. diff --git a/content/code-security/dependabot/working-with-dependabot/managing-dependabot-on-self-hosted-runners.md b/content/code-security/dependabot/working-with-dependabot/managing-dependabot-on-self-hosted-runners.md index 81378376ca06..09f7970b0770 100644 --- a/content/code-security/dependabot/working-with-dependabot/managing-dependabot-on-self-hosted-runners.md +++ b/content/code-security/dependabot/working-with-dependabot/managing-dependabot-on-self-hosted-runners.md @@ -23,6 +23,8 @@ topics: You can help users of your organization and repositories to create and maintain secure code by setting up {% data variables.product.prodname_dependabot %} security and version updates. With {% data variables.product.prodname_dependabot_updates %}, developers can configure repositories so that their dependencies are updated and kept secure automatically. Running {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} allows for better performance, and increased visibility and control of {% data variables.product.prodname_dependabot %} jobs. +{% data reusables.dependabot.vnet-arc-note %} + To have greater control over {% data variables.product.prodname_dependabot %} access to your private registries and internal network resources, you can configure {% data variables.product.prodname_dependabot %} to run on {% data variables.product.prodname_actions %} self-hosted runners. For security reasons, when running {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} self-hosted runners, {% data variables.product.prodname_dependabot_updates %} will not be run on public repositories. diff --git a/content/copilot/customizing-copilot/indexing-repositories-for-copilot-chat.md b/content/copilot/customizing-copilot/indexing-repositories-for-copilot-chat.md index 8189929e5d11..809f93163d31 100644 --- a/content/copilot/customizing-copilot/indexing-repositories-for-copilot-chat.md +++ b/content/copilot/customizing-copilot/indexing-repositories-for-copilot-chat.md @@ -40,11 +40,11 @@ If you have a seat on the {% data variables.product.prodname_copilot_enterprise_ {% endif %} {% ifversion ghec or fpt %} -If you have a seat on the {% data variables.product.prodname_copilot_business_short %} (CB) plan, you are subject to the indexing limit for your organization. You cannot index additional repositories once your organization reaches the repository limit, but you can still benefit from the indexes created by other users. +If you have a seat on the {% data variables.product.prodname_copilot_business_short %} (CB) plan, you are subject to the indexing limit for your organization. Additionally, you can only index repositories that belong to the GitHub organization that assigned your Copilot seat. You cannot index additional repositories once your organization reaches the repository limit, but you can still benefit from the indexes created by other users. {% endif %} {% ifversion fpt %} -If you have a {% data variables.product.prodname_copilot_individuals_short %} (CI) plan, you are subject to an indexing limit and can index any repository that you belong to. However, you can still benefit from the indexes created by other users without affecting your limit. +If you have a {% data variables.product.prodname_copilot_individuals_short %} (CI) plan, you are subject to an indexing limit and can index any repository that you have access to. However, you can still benefit from the indexes created by other users without affecting your limit. {% endif %} Both CE and CB plans can apply content exclusions to control the behavior of {% data variables.product.prodname_copilot %} for the {% data variables.product.prodname_copilot_short %} seats they manage. For more information, see "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/setting-policies-for-copilot-in-your-organization/excluding-content-from-github-copilot)." However, CI users can still index any repository they have access to, regardless of the content exclusion policies set by the organization. diff --git a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-policies-as-an-individual-subscriber.md b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-policies-as-an-individual-subscriber.md index 4cb9f3fa62ed..51bb10e2c011 100644 --- a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-policies-as-an-individual-subscriber.md +++ b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-policies-as-an-individual-subscriber.md @@ -24,7 +24,7 @@ In addition to the configuration for the {% data variables.product.prodname_copi Your personal settings for {% data variables.product.prodname_copilot %} include an option to either allow or block code suggestions that match publicly available code. If you choose to block suggestions matching public code, {% data variables.product.prodname_copilot %} checks code suggestions with their surrounding code of about 150 characters against public code on {% data variables.product.prodname_dotcom %}. If there is a match, or a near match, the suggestion is not shown to you. -If you choose to allow suggestions matching public code, and you accept a suggestion for which one or more matches were found, you can click through from an entry in the {% data variables.product.prodname_copilot %} log to view a list of references on {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions)." +If you choose to allow suggestions matching public code, when {% data variables.product.prodname_copilot_short %} suggests matching code you can display details of the matches and click through to the relevant repositories on {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions)." {% data reusables.user-settings.copilot-settings %} 1. To the right of **Suggestions matching public code**, select the dropdown menu, then click **Allow** to allow suggestions matching public code, or **Block** to block suggestions matching public code. diff --git a/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-chat-in-github.md b/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-chat-in-github.md index 655fbb17afc2..0b11fb6be167 100644 --- a/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-chat-in-github.md +++ b/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-chat-in-github.md @@ -131,7 +131,11 @@ Depending on factors such as your codebase and input data, you may experience di ### Matches with public code -{% data variables.product.prodname_copilot_chat_short %} is capable of generating new code, which it does in a probabilistic way. While the probability that it may produce code that matches code in the training set is low, a {% data variables.product.prodname_copilot_chat_short %} suggestion may contain some code snippets that match code in the training set. {% data variables.product.prodname_copilot_chat_short %} utilizes filters that block matches with public code on {% data variables.product.prodname_dotcom %} repositories, but you should always take the same precautions as you would with any code you write that uses material you did not independently originate, including precautions to ensure its suitability. These include rigorous testing, IP scanning, and checking for security vulnerabilities. +{% data variables.product.prodname_copilot_chat_short %} is capable of generating new code, which it does in a probabilistic way. While the probability that it may produce code that matches code in the training set is low, a {% data variables.product.prodname_copilot_chat_short %} suggestion may contain some code snippets that match code in the training set. + +If you have disabled suggestions that match public code then {% data variables.product.prodname_copilot_chat_short %} utilizes filters that prevent it from showing code that matches code found in public repositories on {% data variables.product.prodname_dotcom %}. However, you should always take the same precautions as you would with any code you write that uses material you did not independently originate, including precautions to ensure its suitability. These include rigorous testing, IP scanning, and checking for security vulnerabilities. + +If you have enabled suggestions that match public code then {% data variables.product.prodname_copilot_chat_short %} displays a message if matching code is found. The message includes links to repositories on {% data variables.product.github %} that contain matching code, and any license details that were found. For more information, see "[AUTOTITLE](/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions)." ### Inaccurate code diff --git a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-github.md b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-github.md index ce4d578fe456..f2f2a3e5b166 100644 --- a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-github.md +++ b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-github.md @@ -279,9 +279,7 @@ You can chat with {% data variables.product.prodname_copilot_short %} about a fi 1. You can continue the conversation by asking a follow-up question. For example, you could type "tell me more" to get {% data variables.product.prodname_copilot_short %} to expand on its last comment. 1. To clear, delete, or rename the current conversation thread, or to start a new thread, type `/` in the "Ask {% data variables.product.prodname_copilot_short %}" box, select from the options that are displayed, then press Enter. -1. To view a conversation in immersive mode, displaying just the conversation thread, click the dashed box icon at the top right of the conversation thread. - - ![Screenshot of the immersive mode button at the top right of the {% data variables.product.prodname_copilot_short %} panel. The button is highlighted with a dark orange outline.](/assets/images/help/copilot/copilot-immersive-view-button.png) +1. To view a conversation in immersive mode, displaying just the conversation thread, click {% octicon "kebab-horizontal" aria-label="Open conversation options" %} at the top right of the conversation thread, then click {% octicon "screen-full" aria-hidden="true" %} **Take conversation to immersive**. ## Asking questions about {% data variables.product.prodname_GH_advanced_security %} alerts diff --git a/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md b/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md index 9c3a51f28dbd..8f389bb1cc32 100644 --- a/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md +++ b/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md @@ -1,7 +1,7 @@ --- title: Finding public code that matches GitHub Copilot suggestions shortTitle: Find matching code -intro: 'If you allow {% data variables.product.prodname_copilot %} to make suggestions that match publicly available code, you''ll see references to the matching code that was found on {% data variables.product.prodname_dotcom_the_website %}.' +intro: 'If you allow {% data variables.product.prodname_copilot %} to make suggestions that match publicly available code, {% data variables.product.prodname_copilot_short %} will display references to any matching code that is found.' redirect_from: - /early-access/copilot/code-referencing-in-github-copilot topics: @@ -10,9 +10,21 @@ versions: feature: copilot --- +{% webui %} + +This version of this article is for {% data variables.product.prodname_copilot_short %} on the {% data variables.product.github %} website. For the {% data variables.product.prodname_vscode %} version of this article, click the tab above. + +{% endwebui %} + +{% vscode %} + +This version of this article is for {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_vscode %}. For the {% data variables.product.github %} website version of this article, click the tab above. + +{% endvscode %} + ## Limitations -References to matching code are currently only available in {% data variables.product.prodname_vscode %}. +References to matching code are currently only available in {% data variables.product.prodname_vscode %} and on the {% data variables.product.github %} website. ## Prerequisites @@ -20,13 +32,32 @@ References to matching code are only generated if {% data variables.product.prod ## About code referencing in {% data variables.product.prodname_copilot %} +{% vscode %} + If you've allowed suggestions that match public code, {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode_shortname %} can provide you with details of the code that a suggestion matches. This happens: * When you accept a code completion suggestion in the editor. * When a response in {% data variables.product.prodname_copilot_chat_short %} includes matching code. +{% endvscode %} + +{% webui %} + +If you've allowed suggestions that match public code, then whenever a response from {% data variables.product.prodname_copilot_chat_short %} includes matching code, details of the matches will be included in the response. + +{% endwebui %} + This feature is called code referencing. +{% webui %} + +> [!NOTE] +> Typically, matches to public code occur infrequently, so you should not expect to see code references in many {% data variables.product.prodname_copilot_chat_short %} responses. + +{% endwebui %} + +{% vscode %} + ### Code referencing for {% data variables.product.prodname_copilot_short %} code completion When you accept a code completion suggestion that matches code in a public {% data variables.product.prodname_dotcom %} repository, an entry is added to a {% data variables.product.prodname_copilot %} log. The log entry includes a link to a page on {% data variables.product.prodname_dotcom_the_website %} where you can view references to similar code in public {% data variables.product.prodname_dotcom %} repositories. @@ -34,16 +65,20 @@ When you accept a code completion suggestion that matches code in a public {% da The linked web page includes details of any license identified for the repository where the matching code was found. Having reviewed the references, you can decide how to proceed. For example, you can decide what attribution to use, or whether you want to remove this code from your project. > [!NOTE] -> * Code referencing only occurs for matches of accepted {% data variables.product.prodname_copilot_short %} suggestions. Code you have written, and {% data variables.product.prodname_copilot_short %} suggestions you have altered, are not checked for matches to public code. +> * Code referencing for code completion only occurs for matches of accepted {% data variables.product.prodname_copilot_short %} suggestions. Code you have written, and {% data variables.product.prodname_copilot_short %} suggestions you have altered, are not checked for matches to public code. > * Typically, matches to public code occur in less than one percent of {% data variables.product.prodname_copilot_short %} suggestions, so you should not expect to see code references for many suggestions. ### Code referencing for {% data variables.product.prodname_copilot_chat_short %} When {% data variables.product.prodname_copilot_chat_short %} provides a response that includes code that matches code in a public {% data variables.product.prodname_dotcom %} repository, this is indicated at the end of the response with a link to display details of the matched code in the {% data variables.product.prodname_vscode_shortname %} editor. +{% endvscode %} + ### How code referencing finds matching code -{% data variables.product.prodname_copilot_short %} code referencing searches for matches by taking the code suggestion, plus some surrounding code, and comparing it against an index of all public repositories on {% data variables.product.prodname_dotcom_the_website %}. Code in private {% data variables.product.prodname_dotcom %} repositories, or code outside of {% data variables.product.prodname_dotcom %}, is not included in the search process. The search index is refreshed every few months. As a result, newly committed code, and code from public repositories deleted before the index was created, may not be included in the search. For the same reason, the search may return matches to code that has been deleted or moved since the index was created. +{% data variables.product.prodname_copilot_short %} code referencing searches for matches by taking the code suggestion, plus some of the code that will surround the suggestion if it is accepted, and comparing it against an index of all public repositories on {% data variables.product.prodname_dotcom_the_website %}. Code in private {% data variables.product.prodname_dotcom %} repositories, or code outside of {% data variables.product.prodname_dotcom %}, is not included in the search process. The search index is refreshed every few months. As a result, newly committed code, and code from public repositories deleted before the index was created, may not be included in the search. For the same reason, the search may return matches to code that has been deleted or moved since the index was created. + +{% vscode %} ## View code references for code completion @@ -101,8 +136,12 @@ You can verify that code referencing is working by prompting {% data variables.p If code referencing finds a match to public code, a log entry is added to the **{% data variables.product.prodname_copilot %} Log** view. +{% endvscode %} + ## View code references for {% data variables.product.prodname_copilot_chat_short %} +{% vscode %} + If a response in {% data variables.product.prodname_copilot_chat_short %} includes matching code, this is indicated at the end of the response by the following text: > Similar code found with _n_ license types - **View matches** @@ -116,3 +155,23 @@ If a response in {% data variables.product.prodname_copilot_chat_short %} includ * A code snippet showing the matching code. 1. In the editor, Ctrl+click (Windows/Linux) or Command+click (Mac) a URL to view the full file on {% data variables.product.prodname_dotcom_the_website %}. + +{% endvscode %} + +{% webui %} + +When {% data variables.product.prodname_copilot_chat_short %} provides a response that includes code that matches code in a public {% data variables.product.prodname_dotcom %} repository, this is indicated beneath the code suggestion: + +> < > Public code references from _n_ repositories + +To see details of the matching code: + +1. Click the "Public code references..." text, under the code suggestion. + + A list of {% data variables.product.github %} repositories containing matching code is displayed in a dropdown, together with licensing information, if found. + + ![Screenshot of a code completion suggestion in {% data variables.product.prodname_copilot_chat_short %} with a link to view code references.](/assets/images/help/copilot/code-reference-dotcom.png) + +1. Click the name of a repository to display that repository on {% data variables.product.prodname_dotcom_the_website %}. + +{% endwebui %} diff --git a/content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md b/content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md index 0b04632e0881..a9dd91c59183 100644 --- a/content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md +++ b/content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md @@ -83,8 +83,8 @@ shortTitle: Configure default editor {% mac %} {% data reusables.desktop.mac-select-desktop-menu %} -1. In the Preferences window, select **Integrations**. - ![Screenshot of the "Preferences" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png) +1. In the Settings window, select **Integrations**. + ![Screenshot of the "Settings" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png) 1. Under "External Editor", use the dropdown menu to select the editor you want to set as your default. 1. Click **Save**. @@ -103,10 +103,9 @@ shortTitle: Configure default editor ## Configuring a custom editor {% data reusables.desktop.mac-select-desktop-menu %} -1. In the Preferences window, select **Integrations**. - ![Screenshot of the "Preferences" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png) +1. In the Settings window, select **Integrations**. + ![Screenshot of the "Settings" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-integrations-pane.png) 1. Under "External Editor", use the dropdown menu to select **Configure Custom Editor**. - ![Screenshot of the "Preferences window. Under "External Editor", the dropdown menu is displayed with "Configure Custom Editor" highlighted in blue and outlined in orange.](/assets/images/help/desktop/configure-custom-editor.png) 1. Click **Choose** to open the system dialog to navigate to the path of your custom editor. 1. Under "Arguments", enter any arguments you would like to use after the "%TARGET_PATH%" variable. Reference supporting documentation for your custom editor to ensure you have the arguments set correctly, as invalid arguments can prevent the editor from launching in {% data variables.product.prodname_desktop %}. 1. Click **Save**. diff --git a/content/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop.md b/content/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop.md index df501be5150c..a93cbd7037f1 100644 --- a/content/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop.md +++ b/content/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop.md @@ -13,11 +13,11 @@ shortTitle: Configure basic settings {% mac %} {% data reusables.desktop.mac-select-desktop-menu %} -1. To view or change your settings, toggle between the panes in the "Preferences" window. +1. To view or change your settings, toggle between the panes in the "Settings" window. - ![Screenshot of the "Preferences" window. The left sidebar, with menu options such as "Accounts" and "Integrations", is highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png) + ![Screenshot of the "Settings" window. The left sidebar contains menu options such as "Accounts" and "Integrations".](/assets/images/help/desktop/sign-in-github.png) - {% data reusables.desktop.preferences-options-tabs %} + {% data reusables.desktop.settings-options-tabs %} {% endmac %} @@ -28,7 +28,7 @@ shortTitle: Configure basic settings ![Screenshot of the "Options" window. The left sidebar, with menu options such as "Accounts" and "Integrations", is highlighted with an orange outline.](/assets/images/help/desktop/window-select-options-pane.png) - {% data reusables.desktop.preferences-options-tabs %} + {% data reusables.desktop.settings-options-tabs %} {% endwindows %} diff --git a/content/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md b/content/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md index bc39bd3783b0..c2416ab7ea68 100644 --- a/content/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md +++ b/content/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md @@ -32,7 +32,7 @@ Configuring your global author information in {% data variables.product.prodname {% mac %} {% data reusables.desktop.mac-select-desktop-menu %} -{% data reusables.desktop.preferences-git-pane %} +{% data reusables.desktop.settings-git-pane %} {% data reusables.desktop.name-field-git-config %} {% data reusables.desktop.select-email-git-config %} {% data reusables.desktop.click-save-git-config %} @@ -89,8 +89,8 @@ You can configure the default branch that will be used when you create a new rep {% mac %} {% data reusables.desktop.mac-select-desktop-menu %} -{% data reusables.desktop.preferences-git-pane %} -1. Under "Default branch name for new repositories", select the default branch name you would like to use, or, to enter a custom name, select "Other...". +{% data reusables.desktop.settings-git-pane %} +1. Optional, under "Default branch name for new repositories" edit the name of the default branch as needed. {% data reusables.desktop.click-save-git-config %} {% endmac %} diff --git a/content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md b/content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md index 9320769641f1..3c4bc9114ef2 100644 --- a/content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md +++ b/content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md @@ -37,7 +37,9 @@ To change how you view diffs, in the top-right corner of the diff view, click {% * To change how the entire diff is displayed, under "Diff display", select **Unified** or **Split**. The Unified view shows changes linearly, while the Split view shows old content on the left side and new content on the right side. * To hide whitespace changes so you can focus on more substantive changes, select **Hide Whitespace Changes**. -![Screenshot of the diff view of a "README" file. A gear icon is outlined in orange above an expanded dropdown displaying "Whitespace" and "Diff display" settings.](/assets/images/help/desktop/diff-selection.png) +![Screenshot of the diff view of a file. A gear icon is outlined in orange and expanded to display "Whitespace" and "Diff display" settings.](/assets/images/help/desktop/diff-selection.png) + +{% data reusables.desktop.diff-tab-size-tip %} If you need to see more of the file than {% data variables.product.prodname_desktop %} shows by default, you can expand the diff. * To see the next few lines above or below the highlighted changes, click the arrow above or below the line numbers. @@ -66,7 +68,7 @@ If one file contains multiple changes, but you only want some of those changes t To exclude changed lines from your commit, click one or more changed lines so the blue disappears. The lines that are still highlighted in blue will be included in the commit. -![Screenshot of the diff view of a text file. Next to the text "I don't want to include this line", the background color behind the line numbers is green, not blue.](/assets/images/help/desktop/partial-commit.png) +![Screenshot of the diff view of a file. The background color for the line number of "I don't want to include this line" is green, not blue.](/assets/images/help/desktop/partial-commit.png) ## Discarding changes @@ -115,7 +117,7 @@ Once you're satisfied with the changes you've chosen to include in your commit, ![Screenshot of the "Changes" tab in the sidebar. To the right of a profile picture, a text field containing a commit message is outlined in orange.](/assets/images/help/desktop/commit-message.png) 1. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include. - ![Screenshot of the "Changes" tab. In the corner of the "Description" field, a "person with a plus sign" icon for adding a co-author is outlined in orange.](/assets/images/help/desktop/add-co-author-commit.png) + ![Screenshot of the "Changes" tab. In the corner of the "Description" field, the icon for adding a co-author is outlined in orange.](/assets/images/help/desktop/add-co-author-commit.png) {% data reusables.desktop.commit-button %} 1. If the branch you're trying to commit to is protected, Desktop will warn you. * To move your changes, click **switch branches**. diff --git a/content/desktop/overview/getting-started-with-github-desktop.md b/content/desktop/overview/getting-started-with-github-desktop.md index 4429ff650f85..c8814bb1b0f0 100644 --- a/content/desktop/overview/getting-started-with-github-desktop.md +++ b/content/desktop/overview/getting-started-with-github-desktop.md @@ -55,9 +55,9 @@ After you install {% data variables.product.prodname_desktop %}, you can configu {% mac %} -You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Preferences window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)." +You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Settings window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)." -![Screenshot of the "Preferences" window. Options in the left sidebar are highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png) +![Screenshot of the "Settings" window. The first option in the left sidebar is selected and shown as blue.](/assets/images/help/desktop/sign-in-github.png) {% endmac %} @@ -65,7 +65,7 @@ You can connect or remove accounts on {% data variables.product.prodname_dotcom You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Options window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)." -![Screenshot of the "Preferences" window. Options in the left sidebar are highlighted with an orange outline.](/assets/images/help/desktop/mac-select-preferences-pane.png) +![Screenshot of the "Options" window. The first option in the left sidebar is selected and shown as blue.](/assets/images/help/desktop/windows-sign-in-github.png) {% endwindows %} diff --git a/content/desktop/overview/github-desktop-keyboard-shortcuts.md b/content/desktop/overview/github-desktop-keyboard-shortcuts.md index 96a8b908e4ba..1825e24630f5 100644 --- a/content/desktop/overview/github-desktop-keyboard-shortcuts.md +++ b/content/desktop/overview/github-desktop-keyboard-shortcuts.md @@ -19,7 +19,7 @@ GitHub Desktop keyboard shortcuts on macOS | Keyboard shortcut | Description |-----------|------------ -|Command+, | Go to Preferences +|Command+, | Display the Settings window |Command+H | Hide the {% data variables.product.prodname_desktop %} application |Option+Command+H | Hide all other applications |Command+Q | Quit {% data variables.product.prodname_desktop %} @@ -80,7 +80,7 @@ GitHub Desktop keyboard shortcuts on Windows | Keyboard shortcut | Description |-----------|------------ -|Ctrl+, | Go to Options +|Ctrl+, | Display the Options window |F11 | Toggle full screen view |Ctrl+0 | Reset zoom to default text size |Ctrl+= | Zoom in for larger text and graphics diff --git a/content/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md b/content/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md index 04f9a24c0b17..40a572b92c34 100644 --- a/content/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md +++ b/content/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md @@ -35,7 +35,7 @@ If system notifications are disabled for {% data variables.product.prodname_desk {% mac %} {% data reusables.desktop.mac-select-desktop-menu %} -1. In the "Preferences" window, on the "Notifications" pane, select **Enable notifications**. +1. In the "Settings" window, on the "Notifications" pane, select **Enable notifications**. 1. In the "Enable notifications" description field, click the **Notification Settings** link to open the "Notifications" pane in the macOS "System Settings" window. 1. In the "Application Notifications" list, select **{% data variables.product.prodname_desktop %}**. 1. Click **Allow Notifications**. diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/about-migrations-between-github-products.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/about-migrations-between-github-products.md index 1325d1f3adc0..efcd3a5d289f 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/about-migrations-between-github-products.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/about-migrations-between-github-products.md @@ -61,7 +61,7 @@ Milestones | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "c Wikis | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | {% data variables.product.prodname_actions %} workflows | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | Commit comments | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | -Active webhooks | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | +Webhooks (must be re-enabled after your migration, see "[Enabling webhooks](/migrations/using-github-enterprise-importer/migrating-between-github-products/overview-of-a-migration-between-github-products#enabling-webhooks)") | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | Branch protections | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | {% data variables.product.prodname_pages %} settings | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | User history for the above data | {% octicon "check" aria-label="Can be migrated" %} | {% octicon "check" aria-label="Can be migrated" %} | diff --git a/content/packages/learn-github-packages/about-permissions-for-github-packages.md b/content/packages/learn-github-packages/about-permissions-for-github-packages.md index f2ddd9d99ab5..f290e66a34c6 100644 --- a/content/packages/learn-github-packages/about-permissions-for-github-packages.md +++ b/content/packages/learn-github-packages/about-permissions-for-github-packages.md @@ -65,14 +65,13 @@ To use or manage a package hosted by a package registry, you must use a {% data For example: * To download and install packages from a repository, your {% data variables.product.pat_v1 %} must have the `read:packages` scope, and your user account must have read permission. -* To delete a package on {% data variables.product.product_name %}, your {% data variables.product.pat_v1 %} must at least have the `delete:packages` and `read:packages` scope. The `repo` scope is also required for repo-scoped packages. For more information, see "[AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package)." +* To delete a package on {% data variables.product.product_name %}, your {% data variables.product.pat_v1 %} must at least have the `delete:packages` and `read:packages` scope. For more information, see "[AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package)." | Scope | Description | Required permission | | --- | --- | --- | -|`read:packages`| Download and install packages from {% data variables.product.prodname_registry %} | read | -|`write:packages`| Upload and publish packages to {% data variables.product.prodname_registry %} | write | +| `read:packages` | Download and install packages from {% data variables.product.prodname_registry %} | read | +| `write:packages` | Upload and publish packages to {% data variables.product.prodname_registry %} | write | | `delete:packages` | Delete packages from {% data variables.product.prodname_registry %} | admin | -| `repo` | Upload and delete packages (along with `write:packages`, or `delete:packages`) | write or admin | {% data reusables.package_registry.delete-with-github-token-using-api-beta %} diff --git a/data/features/code-scanning-default-setup-go.yml b/data/features/code-scanning-default-setup-go.yml deleted file mode 100644 index c6abf09c17d3..000000000000 --- a/data/features/code-scanning-default-setup-go.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Reference: #9961 -versions: - fpt: '*' - ghec: '*' - ghes: '>3.9' diff --git a/data/features/code-scanning-exclude-queries-from-analysis.yml b/data/features/code-scanning-exclude-queries-from-analysis.yml deleted file mode 100644 index 3d197dfd0694..000000000000 --- a/data/features/code-scanning-exclude-queries-from-analysis.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Issue 7617 -# Users can easily exclude CodeQL queries from code scanning analyses - [GA] -versions: - fpt: '*' - ghec: '*' - ghes: '>3.6' diff --git a/data/features/code-scanning-pr-conversations-tab.yml b/data/features/code-scanning-pr-conversations-tab.yml deleted file mode 100644 index 18c8223067b4..000000000000 --- a/data/features/code-scanning-pr-conversations-tab.yml +++ /dev/null @@ -1,4 +0,0 @@ -versions: - fpt: '*' - ghec: '*' - ghes: '>=3.7' diff --git a/data/features/code-scanning-without-workflow-310.yml b/data/features/code-scanning-without-workflow-310.yml deleted file mode 100644 index ee210c21f920..000000000000 --- a/data/features/code-scanning-without-workflow-310.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Reference: #9106 for language picker - -versions: - fpt: '*' - ghec: '*' - ghes: '> 3.9' diff --git a/data/features/codeql-action-debug-logging.yml b/data/features/codeql-action-debug-logging.yml deleted file mode 100644 index e8a59be6e881..000000000000 --- a/data/features/codeql-action-debug-logging.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Reference: Issue #2499 in the codeql-core repository, and issue #7626 in the docs-content repository -# We have added one-click re-running in debug mode for code scanning CodeQL. -versions: - fpt: '*' - ghec: '*' - ghes: '>3.6' diff --git a/data/reusables/actions/runner-essential-communications.md b/data/reusables/actions/runner-essential-communications.md index f1864f450bf1..0ef1aeecf0a1 100644 --- a/data/reusables/actions/runner-essential-communications.md +++ b/data/reusables/actions/runner-essential-communications.md @@ -49,3 +49,12 @@ ghcr.io github-cloud.githubusercontent.com github-cloud.s3.amazonaws.com ``` + +{% ifversion fpt or ghec %} +**Needed for jobs for {% data variables.product.prodname_dependabot_updates %}** + +```shell copy +dependabot-actions.githubapp.com +``` + +{% endif %} diff --git a/data/reusables/copilot/copilot-immersive-mode.md b/data/reusables/copilot/copilot-immersive-mode.md deleted file mode 100644 index 80ef24e61d06..000000000000 --- a/data/reusables/copilot/copilot-immersive-mode.md +++ /dev/null @@ -1,3 +0,0 @@ -1. In the {% data variables.product.prodname_copilot_short %} panel, click the immersive mode button (a dashed square) at the top right of the panel. - - ![Screenshot of the immersive mode button at the top right of the {% data variables.product.prodname_copilot_short %} panel. The button is highlighted with a dark orange outline.](/assets/images/help/copilot/copilot-immersive-view-button.png) diff --git a/data/reusables/dependabot/dependabot-runners-network-requirements.md b/data/reusables/dependabot/dependabot-runners-network-requirements.md index 52d430472281..72613c1627ba 100644 --- a/data/reusables/dependabot/dependabot-runners-network-requirements.md +++ b/data/reusables/dependabot/dependabot-runners-network-requirements.md @@ -1 +1,6 @@ {% data variables.product.prodname_dependabot %} runners require access to the public internet, {% data variables.product.prodname_dotcom_the_website %}, and any internal registries that will be used in {% data variables.product.prodname_dependabot_updates %}. To minimize the risk to your internal network, you should limit access from the Virtual Machine (VM) to your internal network. This reduces the potential for damage to internal systems if a runner were to download a hijacked dependency. + +{% ifversion fpt or ghec %} +You must also allow outbound traffic to `dependabot-actions.githubapp.com` to prevent the jobs for {% data variables.product.prodname_dependabot_security_updates %} from failing. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github)." + +{% endif %} diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 96e44d5c8a24..347f682cb5d8 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -16,7 +16,7 @@ Go modules | `gomod` | v1 | {% octicon "check" aria-l [Gradle](#gradle) | `gradle` | Not applicable | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | [Maven](#maven) | `maven` | Not applicable | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | npm | `npm` | v6, v7, v8, v9 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | -[NuGet](#nuget-cli) | `nuget` | {% ifversion dependabot-updates-v680-nuget-support %}<=6.8.0{% elsif ghes = 3.12 %}<= 6.7.0{% else %}<= 4.8{% endif %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | +[NuGet](#nuget-cli) | `nuget` | {% ifversion fpt or ghec or ghes > 3.14 %}<=6.12.0{% elsif ghes = 3.14 or ghes = 3.13 %}<= 6.8.0{% elsif ghes = 3.12 %}<= 6.7.0{% else %}<= 4.8{% endif %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | | {% ifversion dependabot-PEP621-support %}[pip](#pip-and-pip-compile){% else %}pip{% endif %} | `pip` | v21.1.2 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | pipenv | `pip` | <= 2021-05-29 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | | {% ifversion dependabot-PEP621-support %}[pip-compile](#pip-and-pip-compile){% else %}pip-compile{% endif %} | `pip` | 6.1.0 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | diff --git a/data/reusables/dependabot/vnet-arc-note.md b/data/reusables/dependabot/vnet-arc-note.md new file mode 100644 index 000000000000..d95cf4e09b7a --- /dev/null +++ b/data/reusables/dependabot/vnet-arc-note.md @@ -0,0 +1 @@ +> [!NOTE] {% data variables.product.prodname_dependabot %} does not support using private networking with either an Azure Virtual Network (VNET) or the Actions Runner Controller (ARC). diff --git a/data/reusables/desktop/choose-a-theme.md b/data/reusables/desktop/choose-a-theme.md index 83dd63dc5e31..9267fb19f933 100644 --- a/data/reusables/desktop/choose-a-theme.md +++ b/data/reusables/desktop/choose-a-theme.md @@ -2,7 +2,7 @@ {% mac %} - ![Screenshot of the "Preferences" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes.png) + ![Screenshot of the "Settings" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes.png) {% endmac %} diff --git a/data/reusables/desktop/diff-tab-size-tip.md b/data/reusables/desktop/diff-tab-size-tip.md new file mode 100644 index 000000000000..6aaabb4d6fa1 --- /dev/null +++ b/data/reusables/desktop/diff-tab-size-tip.md @@ -0,0 +1,11 @@ +{% mac %} + +> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Settings** dialog. + +{% endmac %} + +{% windows %} + +> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Options** dialog. + +{% endwindows %} diff --git a/data/reusables/desktop/preferences-git-pane.md b/data/reusables/desktop/settings-git-pane.md similarity index 81% rename from data/reusables/desktop/preferences-git-pane.md rename to data/reusables/desktop/settings-git-pane.md index 38af2dfd0a1e..9d85b8406c7f 100644 --- a/data/reusables/desktop/preferences-git-pane.md +++ b/data/reusables/desktop/settings-git-pane.md @@ -1,3 +1,3 @@ -1. In the "Preferences" window, click **Git**. +1. In the "Settings" window, click **Git**. ![Screenshot of the "Git" pane in the "Preferences" window. In the left sidebar, an option labelled "Git" is highlighted in blue and outlined in orange.](/assets/images/help/desktop/mac-select-git-pane.png) diff --git a/data/reusables/desktop/preferences-options-tabs.md b/data/reusables/desktop/settings-options-tabs.md similarity index 100% rename from data/reusables/desktop/preferences-options-tabs.md rename to data/reusables/desktop/settings-options-tabs.md diff --git a/data/reusables/enterprise_installation/hardware-rec-table.md b/data/reusables/enterprise_installation/hardware-rec-table.md index 9671219cbecc..51300fa06fc3 100644 --- a/data/reusables/enterprise_installation/hardware-rec-table.md +++ b/data/reusables/enterprise_installation/hardware-rec-table.md @@ -1,6 +1,6 @@ | User licenses | x86-64 vCPUs | Memory | Root storage | Attached (data) storage | IOPS | | :- | -: | -: | -: | -: | -: | -| Trial, demo, or 10 light users | 4 | 32 GB | 200 GB | 200 GB | 600 | +| Trial, demo, or 10 light users | 4 | 32 GB | 400 GB | 500 GB | 600 | | Up to 1,000 | 8 | 48 GB | 400 GB | 500 GB | 3000 | | 1,000 to 3,000 | 16 | 64 GB | 400 GB | 1000 GB | 6000| | 3,000 to 5,000 | 32 | 128 GB | 400 GB | 1500 GB | 9000 | diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json index 203765980b75..bed76cdae2a9 100644 --- a/src/audit-logs/lib/config.json +++ b/src/audit-logs/lib/config.json @@ -3,5 +3,5 @@ "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.", "apiRequestEvent": "This event is only available via audit log streaming." }, - "sha": "50b493f0914184eb8479e18ead886625a6fc2ed6" + "sha": "6a20673ab35be527bc4d1773716a5ac1efe4308a" } \ No newline at end of file diff --git a/src/frame/middleware/index.ts b/src/frame/middleware/index.ts index 9e8794259476..fe11bf133f59 100644 --- a/src/frame/middleware/index.ts +++ b/src/frame/middleware/index.ts @@ -214,12 +214,6 @@ export default function (app: Express) { // *** Headers *** app.set('etag', false) // We will manage our own ETags if desired - // temporary - app.use(function (req, res, next) { - res.set('x-ptcl', req.secure ? 'o' : 'x') - next() - }) - // *** Config and context for redirects *** app.use(detectLanguage) // Must come before context, breadcrumbs, find-page, handle-errors, homepages app.use(asyncMiddleware(reloadTree)) // Must come before context diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json index ff43803e713e..1c39f18972a9 100644 --- a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json +++ b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json @@ -4191,6 +4191,15 @@ "additional-permissions": false, "access": "read" }, + { + "category": "code-scanning", + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "additional-permissions": false, + "access": "write" + }, { "category": "code-scanning", "slug": "create-a-codeql-variant-analysis", diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json index 5a7cbbf8c16d..ce0e241952f3 100644 --- a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json +++ b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json @@ -1424,6 +1424,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json b/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json index 35578322cf0c..d415cee34cc5 100644 --- a/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json +++ b/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json @@ -5144,6 +5144,17 @@ "server-to-server": true, "additional-permissions": false }, + { + "category": "code-scanning", + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "access": "write", + "user-to-server": true, + "server-to-server": true, + "additional-permissions": false + }, { "category": "code-scanning", "slug": "create-a-codeql-variant-analysis", diff --git a/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json b/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json index 564a4ad4524c..1a53bc20dd93 100644 --- a/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json +++ b/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json @@ -1320,6 +1320,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json b/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json index 5a7cbbf8c16d..ce0e241952f3 100644 --- a/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json +++ b/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json @@ -1424,6 +1424,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/data/ghec-2022-11-28/fine-grained-pat-permissions.json b/src/github-apps/data/ghec-2022-11-28/fine-grained-pat-permissions.json index 420c95dbf35b..a633caf98e92 100644 --- a/src/github-apps/data/ghec-2022-11-28/fine-grained-pat-permissions.json +++ b/src/github-apps/data/ghec-2022-11-28/fine-grained-pat-permissions.json @@ -4785,6 +4785,15 @@ "additional-permissions": false, "access": "read" }, + { + "category": "code-scanning", + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "additional-permissions": false, + "access": "write" + }, { "category": "code-scanning", "slug": "create-a-codeql-variant-analysis", diff --git a/src/github-apps/data/ghec-2022-11-28/fine-grained-pat.json b/src/github-apps/data/ghec-2022-11-28/fine-grained-pat.json index 14ecf7818639..44a64f3cc3b7 100644 --- a/src/github-apps/data/ghec-2022-11-28/fine-grained-pat.json +++ b/src/github-apps/data/ghec-2022-11-28/fine-grained-pat.json @@ -1462,6 +1462,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/data/ghec-2022-11-28/server-to-server-permissions.json b/src/github-apps/data/ghec-2022-11-28/server-to-server-permissions.json index 26f813356882..45f83f3adeb2 100644 --- a/src/github-apps/data/ghec-2022-11-28/server-to-server-permissions.json +++ b/src/github-apps/data/ghec-2022-11-28/server-to-server-permissions.json @@ -5904,6 +5904,17 @@ "server-to-server": true, "additional-permissions": false }, + { + "category": "code-scanning", + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "access": "write", + "user-to-server": true, + "server-to-server": true, + "additional-permissions": false + }, { "category": "code-scanning", "slug": "create-a-codeql-variant-analysis", diff --git a/src/github-apps/data/ghec-2022-11-28/server-to-server-rest.json b/src/github-apps/data/ghec-2022-11-28/server-to-server-rest.json index 5c8290e7c105..bb12147bafd6 100644 --- a/src/github-apps/data/ghec-2022-11-28/server-to-server-rest.json +++ b/src/github-apps/data/ghec-2022-11-28/server-to-server-rest.json @@ -1358,6 +1358,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/data/ghec-2022-11-28/user-to-server-rest.json b/src/github-apps/data/ghec-2022-11-28/user-to-server-rest.json index 14ecf7818639..44a64f3cc3b7 100644 --- a/src/github-apps/data/ghec-2022-11-28/user-to-server-rest.json +++ b/src/github-apps/data/ghec-2022-11-28/user-to-server-rest.json @@ -1462,6 +1462,12 @@ "verb": "get", "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" }, + { + "slug": "delete-a-codeql-database", + "subcategory": "code-scanning", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}" + }, { "slug": "create-a-codeql-variant-analysis", "subcategory": "code-scanning", diff --git a/src/github-apps/lib/config.json b/src/github-apps/lib/config.json index 33aa339365cf..1795c338daa7 100644 --- a/src/github-apps/lib/config.json +++ b/src/github-apps/lib/config.json @@ -60,5 +60,5 @@ "2022-11-28" ] }, - "sha": "c8e5a99583a3fd250dada63a4a9f5c4fffc53409" + "sha": "e3b1d8b69b58d9e3b89732e2dc093a635bd86ff5" } \ No newline at end of file diff --git a/src/rest/data/fpt-2022-11-28/schema.json b/src/rest/data/fpt-2022-11-28/schema.json index 4aa0487a6663..84c400417b25 100644 --- a/src/rest/data/fpt-2022-11-28/schema.json +++ b/src/rest/data/fpt-2022-11-28/schema.json @@ -151423,7 +151423,7 @@ } ], "previews": [], - "descriptionHTML": "

Lists the CodeQL databases that are available in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the security_events scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "descriptionHTML": "

Lists the CodeQL databases that are available in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", "statusCodes": [ { "httpStatusCode": "200", @@ -151770,7 +151770,7 @@ } ], "previews": [], - "descriptionHTML": "

Gets a CodeQL database for a language in a repository.

\n

By default this endpoint returns JSON metadata about the CodeQL database. To\ndownload the CodeQL database binary content, set the Accept header of the request\nto application/zip, and make sure\nyour HTTP client is configured to follow redirects or use the Location header\nto make a second request to get the redirect URL.

\n

OAuth app tokens and personal access tokens (classic) need the security_events scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "descriptionHTML": "

Gets a CodeQL database for a language in a repository.

\n

By default this endpoint returns JSON metadata about the CodeQL database. To\ndownload the CodeQL database binary content, set the Accept header of the request\nto application/zip, and make sure\nyour HTTP client is configured to follow redirects or use the Location header\nto make a second request to get the redirect URL.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", "statusCodes": [ { "httpStatusCode": "200", @@ -151794,6 +151794,92 @@ } ] }, + { + "serverUrl": "https://api.github.com", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "title": "Delete a CodeQL database", + "category": "code-scanning", + "subcategory": "code-scanning", + "parameters": [ + { + "name": "owner", + "description": "

The account owner of the repository. The name is not case sensitive.

", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "repo", + "description": "

The name of the repository without the .git extension. The name is not case sensitive.

", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "language", + "in": "path", + "description": "

The language of the CodeQL database.

", + "schema": { + "type": "string" + }, + "required": true + } + ], + "bodyParameters": [], + "progAccess": { + "userToServerRest": true, + "serverToServer": true, + "fineGrainedPat": true, + "permissions": [ + { + "\"Contents\" repository permissions": "write" + } + ] + }, + "codeExamples": [ + { + "key": "default", + "request": { + "description": "Example", + "acceptHeader": "application/vnd.github.v3+json", + "parameters": { + "owner": "OWNER", + "repo": "REPO", + "language": "LANGUAGE" + } + }, + "response": { + "statusCode": "204", + "description": "

Response

" + } + } + ], + "previews": [], + "descriptionHTML": "

Deletes a CodeQL database for a language in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "statusCodes": [ + { + "httpStatusCode": "204", + "description": "

No Content

" + }, + { + "httpStatusCode": "403", + "description": "

Response if the repository is archived or if GitHub Advanced Security is not enabled for this repository

" + }, + { + "httpStatusCode": "404", + "description": "

Resource not found

" + }, + { + "httpStatusCode": "503", + "description": "

Service unavailable

" + } + ] + }, { "serverUrl": "https://api.github.com", "verb": "post", diff --git a/src/rest/data/ghec-2022-11-28/schema.json b/src/rest/data/ghec-2022-11-28/schema.json index ecdb494b197d..f3dbf0633e2a 100644 --- a/src/rest/data/ghec-2022-11-28/schema.json +++ b/src/rest/data/ghec-2022-11-28/schema.json @@ -160107,7 +160107,7 @@ } ], "previews": [], - "descriptionHTML": "

Lists the CodeQL databases that are available in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the security_events scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "descriptionHTML": "

Lists the CodeQL databases that are available in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", "statusCodes": [ { "httpStatusCode": "200", @@ -160454,7 +160454,7 @@ } ], "previews": [], - "descriptionHTML": "

Gets a CodeQL database for a language in a repository.

\n

By default this endpoint returns JSON metadata about the CodeQL database. To\ndownload the CodeQL database binary content, set the Accept header of the request\nto application/zip, and make sure\nyour HTTP client is configured to follow redirects or use the Location header\nto make a second request to get the redirect URL.

\n

OAuth app tokens and personal access tokens (classic) need the security_events scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "descriptionHTML": "

Gets a CodeQL database for a language in a repository.

\n

By default this endpoint returns JSON metadata about the CodeQL database. To\ndownload the CodeQL database binary content, set the Accept header of the request\nto application/zip, and make sure\nyour HTTP client is configured to follow redirects or use the Location header\nto make a second request to get the redirect URL.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", "statusCodes": [ { "httpStatusCode": "200", @@ -160478,6 +160478,92 @@ } ] }, + { + "serverUrl": "https://api.github.com", + "verb": "delete", + "requestPath": "/repos/{owner}/{repo}/code-scanning/codeql/databases/{language}", + "title": "Delete a CodeQL database", + "category": "code-scanning", + "subcategory": "code-scanning", + "parameters": [ + { + "name": "owner", + "description": "

The account owner of the repository. The name is not case sensitive.

", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "repo", + "description": "

The name of the repository without the .git extension. The name is not case sensitive.

", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "language", + "in": "path", + "description": "

The language of the CodeQL database.

", + "schema": { + "type": "string" + }, + "required": true + } + ], + "bodyParameters": [], + "progAccess": { + "userToServerRest": true, + "serverToServer": true, + "fineGrainedPat": true, + "permissions": [ + { + "\"Contents\" repository permissions": "write" + } + ] + }, + "codeExamples": [ + { + "key": "default", + "request": { + "description": "Example", + "acceptHeader": "application/vnd.github.v3+json", + "parameters": { + "owner": "OWNER", + "repo": "REPO", + "language": "LANGUAGE" + } + }, + "response": { + "statusCode": "204", + "description": "

Response

" + } + } + ], + "previews": [], + "descriptionHTML": "

Deletes a CodeQL database for a language in a repository.

\n

OAuth app tokens and personal access tokens (classic) need the repo scope to use this endpoint with private or public repositories, or the public_repo scope to use this endpoint with only public repositories.

", + "statusCodes": [ + { + "httpStatusCode": "204", + "description": "

No Content

" + }, + { + "httpStatusCode": "403", + "description": "

Response if the repository is archived or if GitHub Advanced Security is not enabled for this repository

" + }, + { + "httpStatusCode": "404", + "description": "

Resource not found

" + }, + { + "httpStatusCode": "503", + "description": "

Service unavailable

" + } + ] + }, { "serverUrl": "https://api.github.com", "verb": "post", diff --git a/src/rest/lib/config.json b/src/rest/lib/config.json index 72cc8a818571..af904ae6e2a0 100644 --- a/src/rest/lib/config.json +++ b/src/rest/lib/config.json @@ -47,5 +47,5 @@ ] } }, - "sha": "c8e5a99583a3fd250dada63a4a9f5c4fffc53409" + "sha": "e3b1d8b69b58d9e3b89732e2dc093a635bd86ff5" } \ No newline at end of file diff --git a/src/webhooks/lib/config.json b/src/webhooks/lib/config.json index 4c3c2616a564..9da2074593a9 100644 --- a/src/webhooks/lib/config.json +++ b/src/webhooks/lib/config.json @@ -1,3 +1,3 @@ { - "sha": "c8e5a99583a3fd250dada63a4a9f5c4fffc53409" + "sha": "e3b1d8b69b58d9e3b89732e2dc093a635bd86ff5" } \ No newline at end of file