From 046ffdab081d66d28be0fce8a6b8f34c66600c6f Mon Sep 17 00:00:00 2001 From: Sophie <29382425+sophietheking@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:10:29 +0200 Subject: [PATCH 1/2] [Improvement]: Improve Discoverability of Keybinding Customization (#38613) --- ...ring-github-copilot-in-your-environment.md | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/content/copilot/configuring-github-copilot/configuring-github-copilot-in-your-environment.md b/content/copilot/configuring-github-copilot/configuring-github-copilot-in-your-environment.md index 5b351c7ee4..c6b1d36fdb 100644 --- a/content/copilot/configuring-github-copilot/configuring-github-copilot-in-your-environment.md +++ b/content/copilot/configuring-github-copilot/configuring-github-copilot-in-your-environment.md @@ -3,7 +3,7 @@ title: Configuring GitHub Copilot in your environment shortTitle: In your environment intro: 'You can enable, configure, or disable {% data variables.product.prodname_copilot %} in a supported IDE.' product: '{% data reusables.gated-features.copilot %}' -redirect_from: +redirect_from: - /copilot/configuring-github-copilot/configuring-github-copilot-in-visual-studio - /copilot/configuring-github-copilot/configuring-github-copilot-in-visual-studio-code - /copilot/configuring-github-copilot/configuring-github-copilot-in-a-jetbrains-ide @@ -20,13 +20,11 @@ versions: If you use a JetBrains IDE, {% data variables.product.prodname_copilot %} can autocomplete code as you type. After installation, you can enable or disable {% data variables.product.prodname_copilot %}, and you can configure advanced settings within your IDE or on {% data variables.product.prodname_dotcom_the_website %}. This article describes how to configure {% data variables.product.prodname_copilot %} in the IntelliJ IDE, but the user interfaces of other JetBrains IDEs may differ. -{% data reusables.copilot.dotcom-settings %} - ## Prerequisites To configure {% data variables.product.prodname_copilot %} in a JetBrains IDE, you must install the {% data variables.product.prodname_copilot %} plugin. For more information, see "[AUTOTITLE](/copilot/getting-started-with-github-copilot?tool=jetbrains)." -## Keyboard shortcuts for {% data variables.product.prodname_copilot %} +## Using or rebinding keyboard shortcuts for {% data variables.product.prodname_copilot %} You can use the default keyboard shortcuts for inline suggestions in your JetBrains IDE when using {% data variables.product.prodname_copilot %}. Alternatively, you can rebind the shortcuts to your preferred keyboard shortcuts for each specific command. For more information on rebinding keyboard shortcuts in your JetBrains IDE, see the JetBrains documentation. For example, you can view the [IntelliJ IDEA](https://www.jetbrains.com/help/idea/mastering-keyboard-shortcuts.html#choose-keymap) documentation. @@ -110,17 +108,19 @@ If you use {% data variables.product.prodname_vs %}, {% data variables.product.p To configure {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vs %}, you must install the {% data variables.product.prodname_copilot %} plugin. For more information, see "[AUTOTITLE](/copilot/getting-started-with-github-copilot?tool=visualstudio)." -## Keyboard shortcuts for {% data variables.product.prodname_copilot %} +## Using or rebinding keyboard shortcuts for {% data variables.product.prodname_copilot %} You can use the default keyboard shortcuts in {% data variables.product.prodname_vs %} when using {% data variables.product.prodname_copilot %}. Alternatively, you can rebind the shortcuts in the Tools settings for {% data variables.product.prodname_vs %} using your preferred keyboard shortcuts for each specific command. You can search for each keyboard shortcut by its command name in the Keyboard Shortcuts editor. +### Using default keyboard shortcuts + | Action | Shortcut | Command name | |:---|:---|:---| |Show next inline suggestion|Alt+.|Tools.Nextsuggestion| |Show previous inline suggestion|Alt+,|Tools.Previoussuggestion| |Trigger inline suggestion|Ctrl+Alt+\|Edit.Copilot.TriggerInlineSuggestion| -## Rebinding keyboard shortcuts +### Rebinding keyboard shortcuts If you don't want to use the default keyboard shortcuts in {% data variables.product.prodname_vs %} when using {% data variables.product.prodname_copilot %}, you can rebind the shortcuts in the Keyboard editor using your preferred keyboard shortcuts for each specific command. @@ -164,7 +164,9 @@ To configure {% data variables.product.prodname_copilot %} in {% data variables. ## Keyboard shortcuts for {% data variables.product.prodname_copilot %} -You can use the default keyboard shortcuts in {% data variables.product.prodname_vscode %} when using {% data variables.product.prodname_copilot %}. Alternatively, you can rebind the shortcuts in the Keyboard Shortcuts editor using your preferred keyboard shortcuts for each specific command. You can search for each keyboard shortcut by command name in the Keyboard Shortcuts editor. +You can use the default keyboard shortcuts in {% data variables.product.prodname_vscode %} when using {% data variables.product.prodname_copilot %}. Alternatively, you can rebind the shortcuts in the Keyboard Shortcuts editor using your preferred keyboard shortcuts for each specific command. For more information, see "[Rebinding keyboard shortcuts](/copilot/configuring-github-copilot/configuring-github-copilot-in-your-environment?tool=vscode#rebinding-keyboard-shortcuts-1)." + +You can search for each keyboard shortcut by command name in the Keyboard Shortcuts editor. ### Keyboard shortcuts for macOS @@ -329,6 +331,10 @@ For guidance on configuring {% data variables.product.prodname_copilot %} in Vim :help copilot +## Rebinding keyboard shortcuts + +You can rebind the keyboard shortcuts in Vim/Neovim when using {% data variables.product.prodname_copilot %} to use your preferred keyboard shortcuts for each specific command. For more information, see the [Map](https://neovim.io/doc/user/map.html) article in the Neovim documentation. + {% data reusables.copilot.dotcom-settings %} {% endvimneovim %} From d53bed25e5a5743a027f739fbc074171eae24c2e Mon Sep 17 00:00:00 2001 From: Kensuke Nagae Date: Wed, 28 Jun 2023 18:11:18 +0900 Subject: [PATCH 2/2] Delete duplicated security fix entry of CVE-2023-22490 and CVE-2023-23946 (#38603) --- data/release-notes/enterprise-server/3-5/17.yml | 2 -- data/release-notes/enterprise-server/3-5/19.yml | 2 -- data/release-notes/enterprise-server/3-6/13.yml | 2 -- data/release-notes/enterprise-server/3-6/15.yml | 2 -- data/release-notes/enterprise-server/3-7/10.yml | 2 -- data/release-notes/enterprise-server/3-7/12.yml | 2 -- 6 files changed, 12 deletions(-) diff --git a/data/release-notes/enterprise-server/3-5/17.yml b/data/release-notes/enterprise-server/3-5/17.yml index ea3731c5d8..531eae4e3e 100644 --- a/data/release-notes/enterprise-server/3-5/17.yml +++ b/data/release-notes/enterprise-server/3-5/17.yml @@ -1,8 +1,6 @@ date: '2023-05-09' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | **MEDIUM**: Updated Git to include fixes from 2.40.1. For more information, see [Git security vulnerabilities announced](https://github.blog/2023-04-25-git-security-vulnerabilities-announced-4/) on the GitHub Blog. bugs: diff --git a/data/release-notes/enterprise-server/3-5/19.yml b/data/release-notes/enterprise-server/3-5/19.yml index bbae0d6ab8..dcd98ecb2e 100644 --- a/data/release-notes/enterprise-server/3-5/19.yml +++ b/data/release-notes/enterprise-server/3-5/19.yml @@ -1,8 +1,6 @@ date: '2023-06-20' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | **MEDIUM**: Scoped installation tokens for a GitHub App kept approved permissions after the permissions on the integration installation were downgraded or removed. GitHub has requested CVE ID [CVE-2023-23765](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-23765) for this vulnerability, which was reported via the [GitHub Bug Bounty program](https://bounty.github.com). - | diff --git a/data/release-notes/enterprise-server/3-6/13.yml b/data/release-notes/enterprise-server/3-6/13.yml index 3446bf2340..1b84aad712 100644 --- a/data/release-notes/enterprise-server/3-6/13.yml +++ b/data/release-notes/enterprise-server/3-6/13.yml @@ -1,8 +1,6 @@ date: '2023-05-09' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | **MEDIUM**: Updated Git to include fixes from 2.40.1. For more information, see [Git security vulnerabilities announced](https://github.blog/2023-04-25-git-security-vulnerabilities-announced-4/) on the GitHub Blog. bugs: diff --git a/data/release-notes/enterprise-server/3-6/15.yml b/data/release-notes/enterprise-server/3-6/15.yml index d69f6b4f48..8625d9fa70 100644 --- a/data/release-notes/enterprise-server/3-6/15.yml +++ b/data/release-notes/enterprise-server/3-6/15.yml @@ -1,8 +1,6 @@ date: '2023-06-20' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | If a user's request to the instance's API included authentication credentials within a URL parameter, administrators could see the credentials in JSON within the instance's audit log. - Packages have been updated to the latest security versions. diff --git a/data/release-notes/enterprise-server/3-7/10.yml b/data/release-notes/enterprise-server/3-7/10.yml index 341a8d58ce..d02602d7e2 100644 --- a/data/release-notes/enterprise-server/3-7/10.yml +++ b/data/release-notes/enterprise-server/3-7/10.yml @@ -1,8 +1,6 @@ date: '2023-05-09' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | **MEDIUM**: Updated Git to include fixes from 2.40.1. For more information, see [Git security vulnerabilities announced](https://github.blog/2023-04-25-git-security-vulnerabilities-announced-4/) on the GitHub Blog. bugs: diff --git a/data/release-notes/enterprise-server/3-7/12.yml b/data/release-notes/enterprise-server/3-7/12.yml index eb7a1ce779..a0797d7126 100644 --- a/data/release-notes/enterprise-server/3-7/12.yml +++ b/data/release-notes/enterprise-server/3-7/12.yml @@ -1,8 +1,6 @@ date: '2023-06-20' sections: security_fixes: - - | - **HIGH:** Updated Git to include fixes from 2.39.2, which address [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). - | **MEDIUM**: Updated Git to include fixes from [2.40.1](https://github.blog/2023-04-25-git-security-vulnerabilities-announced-4/). - |