Merge branch 'main' into ramyaparimi/close-on-invalid-label

.github/workflows/staging-deploy-pr-docker.yml

@@ -97,6 +97,7 @@ jobs:
 
             const { default: createApp } = require('./script/deployment/create-app.js')
             const { default: parsePrUrl } = require('./script/deployment/parse-pr-url.js')
+            const { default: getOctokit } = require('./script/helpers/github')
 
             // This helper uses the `GITHUB_TOKEN` implicitly!
             // We're using our usual version of Octokit vs. the provided `github`

content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md

@@ -64,13 +64,20 @@ More resources may be required depending on your usage, such as user activity an
   ```
 2. Copy the included `backup.config-example` file to `backup.config` and open in an editor.
 3. Set the `GHE_HOSTNAME` value to your primary {% data variables.product.prodname_ghe_server %} instance's hostname or IP address.
+
+  {% note %}
+
+  **Note:** If your {% data variables.product.product_location %} is deployed as a cluster or in a high availability configuration using a load balancer, the `GHE_HOSTNAME` can be the load balancer hostname, as long as it allows SSH access (on port 122) to {% data variables.product.product_location %}.
+
+  {% endnote %}
+
 4. Set the `GHE_DATA_DIR` value to the filesystem location where you want to store backup snapshots.
 5. Open your primary instance's settings page at `https://HOSTNAME/setup/settings` and add the backup host's SSH key to the list of authorized SSH keys. For more information, see [Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/guides/installation/accessing-the-administrative-shell-ssh/).
-5. Verify SSH connectivity with {% data variables.product.product_location %} with the `ghe-host-check` command.
+6. Verify SSH connectivity with {% data variables.product.product_location %} with the `ghe-host-check` command.
   ```shell
   $ bin/ghe-host-check		  
   ```		  
-  6. To create an initial full backup, run the `ghe-backup` command.
+  7. To create an initial full backup, run the `ghe-backup` command.
   ```shell
   $ bin/ghe-backup		  
   ```
@@ -95,6 +102,14 @@ In the event of prolonged outage or catastrophic event at the primary site, you
 {% endnote %}
 {% endif %}
 
+{% note %}
+
+**Note:** When performing backup restores to {% data variables.product.product_location %}, the same version supportability rules apply. You can only restore data from at most two feature releases behind.
+
+For example, if you take a backup from GHES 3.0.x, you can restore it into a GHES 3.2.x instance. But, you cannot restore data from a backup of GHES 2.22.x onto 3.2.x, because that would be three jumps between versions (2.22 > 3.0 > 3.1 > 3.2). You would first need to restore onto a 3.1.x instance, and then upgrade to 3.2.x.
+
+{% endnote %}
+
 To restore {% data variables.product.product_location %} from the last successful snapshot, use the `ghe-restore` command. You should see output similar to this:
 
 ```shell

content/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md

@@ -40,7 +40,7 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
   ```
 
   {% endnote %}  
-  This creates a new ssh key, using the provided email as a label.
+  This creates a new SSH key, using the provided email as a label.
   ```shell
   > Generating public/private ed25519 key pair.
   ```

content/github/searching-for-information-on-github/searching-on-github/searching-for-repositories.md

@@ -184,6 +184,17 @@ You can search for repositories that have a minimum number of issues labeled `he
 | `good-first-issues:>n` | [**good-first-issues:>2 javascript**](https://github.com/search?utf8=%E2%9C%93&q=javascript+good-first-issues%3A%3E2&type=) matches repositories with more than two issues labeled `good-first-issue` and that contain the word "javascript."
 | `help-wanted-issues:>n`|[**help-wanted-issues:>4 react**](https://github.com/search?utf8=%E2%9C%93&q=react+help-wanted-issues%3A%3E4&type=) matches repositories with more than four issues labeled `help-wanted` and that contain the word "React."
 
+## Search based on ability to sponsor
+
+You can search for repositories whose owners can be sponsored on {% data variables.product.prodname_sponsors %} with the `is:sponsorable` qualifier. For more information, see "[About {% data variables.product.prodname_sponsors %}](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)."
+
+You can search for repositories that have a funding file using the `has:funding-file` qualifier. For more information, see "[About FUNDING files](/github/administering-a-repository/managing-repository-settings/displaying-a-sponsor-button-in-your-repository#about-funding-files)."
+
+| Qualifier  | Example
+| ------------- | -------------
+| `is:sponsorable` | [**is:sponsorable**](https://github.com/search?q=is%3Asponsorable&type=Repositories) matches repositories whose owners have a {% data variables.product.prodname_sponsors %} profile.
+| `has:funding-file` | [**has:funding-file**](https://github.com/search?q=has%3Afunding-file&type=Repositories) matches repositories that have a FUNDING.yml file.
+
 {% endif %}
 
 ## Further reading

content/github/searching-for-information-on-github/searching-on-github/searching-users.md

@@ -87,6 +87,18 @@ You can filter users based on the number of followers that they have, using the
 | <code>followers:<em>n</em></code> | [**followers:>=1000**](https://github.com/search?q=followers%3A%3E%3D1000&type=Users) matches users with 1,000 or more followers.
 | | [**sparkle followers:1..10**](https://github.com/search?q=sparkle+followers%3A1..10&type=Users) matches users with between 1 and 10 followers, with the word "sparkle" in their name.
 
+{% ifversion fpt %}
+
+## Search based on ability to sponsor
+
+You can search for users and organizations who can be sponsored on {% data variables.product.prodname_sponsors %} with the `is:sponsorable` qualifier. For more information, see "[About {% data variables.product.prodname_sponsors %}](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)."
+
+| Qualifier  | Example
+| ------------- | -------------
+| `is:sponsorable` | [**is:sponsorable**](https://github.com/search?q=is%3Asponsorable&type=Users) matches users and organizations who have a {% data variables.product.prodname_sponsors %} profile.
+
+{% endif %}
+
 ## Further reading
 
 - "[Sorting search results](/articles/sorting-search-results/)"

content/sponsors/getting-started-with-github-sponsors/about-github-sponsors.md

@@ -47,4 +47,6 @@ Donations between sponsored developers will not be matched.
 ## Further reading
 - "[Sponsoring open source contributors](/sponsors/sponsoring-open-source-contributors)"
 - "[Receiving sponsorships through {% data variables.product.prodname_sponsors %}](/sponsors/receiving-sponsorships-through-github-sponsors)"
+- "[Searching users and organizations based on ability to sponsor](/github/searching-for-information-on-github/searching-on-github/searching-users#search-based-on-ability-to-sponsor)"
+- "[Searching repositories based on ability to sponsor](/github/searching-for-information-on-github/searching-on-github/searching-for-repositories#search-based-on-ability-to-sponsor)"
 - "[FAQ with the {% data variables.product.prodname_sponsors %} team](https://github.blog/2019-06-12-faq-with-the-github-sponsors-team/)" on {% data variables.product.prodname_blog %}

data/reusables/codespaces/codespaces-spending-limit-requirement.md

@@ -1,7 +1,7 @@
 {% note %}
 
-**Note:** After the {% data variables.product.prodname_codespaces %} trial period ends, you must set a spending limit before you can use {% data variables.product.prodname_codespaces %}. By default, your organization will have a {% data variables.product.prodname_codespaces %} spending limit of $0, which prevents any codespaces from being created. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.
+**Note:** After the {% data variables.product.prodname_codespaces %} trial period ends, you must set a spending limit before you can use {% data variables.product.prodname_codespaces %}. By default, your organization or enterprise will have a {% data variables.product.prodname_codespaces %} spending limit of $0, which prevents any codespaces from being created or existing codespaces from being opened. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.
 
 {% endnote %}
 
-By default, your organization will have a {% data variables.product.prodname_codespaces %} spending limit of $0, which prevents new codespaces from being created or existing codespaces from being opened. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.
+By default, your organization or enterprise will have a {% data variables.product.prodname_codespaces %} spending limit of $0, which prevents new codespaces from being created or existing codespaces from being opened. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.

data/reusables/secret-scanning/partner-secret-list-private-repo.md

@@ -110,16 +110,18 @@ GitHub | GitHub SSH Private Key | github_ssh_private_key{% endif %}
 GoCardless | GoCardless Live Access Token | gocardless_live_access_token{% endif %}
 {%- ifversion fpt or ghes > 2.22 or ghae-next %}
 GoCardless | GoCardless Sandbox Access Token | gocardless_sandbox_access_token{% endif %}
+{%- ifversion fpt or ghes > 3.2 or ghae-next %}
+Google | Firebase Cloud Messaging Server Key | firebase_cloud_messaging_server_key{% endif %}
 {%- ifversion fpt or ghes > 2.22 or ghae-next %}
-Google Cloud | Google API Key | google_api_key{% endif %}
+Google | Google API Key | google_api_key{% endif %}
 {%- ifversion fpt or ghes > 2.22 or ghae-next %}
-Google Cloud | Google Cloud Private Key ID | google_cloud_private_key_id{% endif %}
+Google | Google Cloud Private Key ID | google_cloud_private_key_id{% endif %}
 {%- ifversion fpt or ghes > 3.2 or ghae-next %}
-Google Cloud | Google Cloud Storage Access Key Secret | google_cloud_storage_access_key_secret{% endif %}
+Google | Google Cloud Storage Access Key Secret | google_cloud_storage_access_key_secret{% endif %}
 {%- ifversion fpt or ghes > 3.2 or ghae-next %}
-Google Cloud | Google Cloud Storage Service Account Access Key ID | google_cloud_storage_service_account_access_key_id{% endif %}
+Google | Google Cloud Storage Service Account Access Key ID | google_cloud_storage_service_account_access_key_id{% endif %}
 {%- ifversion fpt or ghes > 3.2 or ghae-next %}
-Google Cloud | Google Cloud Storage User Access Key ID | google_cloud_storage_user_access_key_id{% endif %}
+Google | Google Cloud Storage User Access Key ID | google_cloud_storage_user_access_key_id{% endif %}
 {%- ifversion fpt or ghes > 3.1 or ghae-next %}
 Grafana | Grafana API Key | grafana_api_key{% endif %}
 {%- ifversion fpt or ghes > 2.22 or ghae-next %}