Skip to content

Commit 2605dff

Browse files
authored
Merge branch 'main' into patch-2
2 parents a6bf0fb + ef47dda commit 2605dff

File tree

14 files changed

+64
-63
lines changed

14 files changed

+64
-63
lines changed
18.7 KB
Loading
29 KB
Loading
43.1 KB
Loading

content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ shortTitle: Missing contributions
1919

2020
Your profile contributions graph is a record of contributions you've made to repositories {% ifversion ghae %}owned by{% else %}on{% endif %} {% data variables.product.product_location %}. Contributions are timestamped according to Coordinated Universal Time (UTC) rather than your local time zone. Contributions are only counted if they meet certain criteria. In some cases, we may need to rebuild your graph in order for contributions to appear.
2121

22+
If you are part of an organization that uses SAML single sign-on (SSO), you won’t be able to see contribution activity from the organization on your profile if you do not have an active SSO session. People viewing your profile from outside your organization will see anonymized contribution activity of your contribution activity for your organization.
23+
2224
## Contributions that are counted
2325

2426
### Issues, pull requests and discussions

content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric
5757
1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot %} security update**.
5858
![Create {% data variables.product.prodname_dependabot %} security update button](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png)
5959
1. When you're ready to update your dependency and resolve the vulnerability, merge the pull request. Each pull request raised by {% data variables.product.prodname_dependabot %} includes information on commands you can use to control {% data variables.product.prodname_dependabot %}. For more information, see "[Managing pull requests for dependency updates](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)."
60-
1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" drop-down, and click a reason for dismissing the alert.
60+
1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% if reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %}
6161
![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png)
6262

6363
{% elsif ghes = 3.3 %}
@@ -94,6 +94,22 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric
9494
![Dismiss security banner](/assets/images/enterprise/3.0/dependabot-alert-dismiss.png)
9595
{% endif %}
9696

97+
{% if reopen-dependabot-alerts %}
98+
99+
## Viewing and updating closed alerts
100+
101+
{% data reusables.repositories.navigate-to-repo %}
102+
{% data reusables.repositories.sidebar-security %}
103+
{% data reusables.repositories.sidebar-dependabot-alerts %}
104+
1. To just view closed alerts, click **Closed**.
105+
![Screenshot showing the "Closed" option](/assets/images/help/repository/dependabot-alerts-closed.png)
106+
1. Click the alert that you would like to view or update.
107+
![Screenshot showing a highlighted dependabot alert](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png)
108+
2. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**.
109+
![Screenshot showing the "Reopen" button](/assets/images/help/repository/reopen-dismissed-alert.png)
110+
111+
{% endif %}
112+
97113
## Further reading
98114

99115
- "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)"{% ifversion fpt or ghec or ghes > 3.2 %}

content/developers/webhooks-and-events/events/issue-event-types.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,16 @@ The pull request's `HEAD` branch was restored to the last known commit.
320320
|:----------|:----------------:|:-----------------:|
321321
| <ul><li>Pull requests</li></ul> | **X** | **X** |
322322

323+
## head_ref_force_pushed
324+
325+
The pull request's HEAD branch was force pushed.
326+
327+
### Availability
328+
329+
|Issue type | Issue events API | Timeline events API|
330+
|:----------|:----------------:|:-----------------:|
331+
| <ul><li>Pull requests</li></ul> | **X** | **X** |
332+
323333
### Event object properties
324334

325335
{% data reusables.issue-events.issue-event-common-properties %}

content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ When you enable auto assignment, any time your team has been requested to review
3636

3737
When code owners are automatically requested for review, the team is still removed and replaced with individuals unless a branch protection rule is configured to require review from code owners. If such a branch protection rule is in place, the team request cannot be removed and so the individual request will appear in addition.
3838

39-
{% ifversion fpt %}
40-
To further enhance your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
41-
{% endif %}
42-
4339
### Routing algorithms
4440

4541
Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.

content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Working with the Docker registry
3-
intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry, which uses the package namespace `https://docker.pkg.github.com`.{% endif %}'
3+
intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry.{% endif %}'
44
product: '{% data reusables.gated-features.packages %}'
55
redirect_from:
66
- /articles/configuring-docker-for-use-with-github-package-registry

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat
9292
## Limits on use of {% data variables.product.prodname_pages %}
9393

9494
{% ifversion fpt or ghec %}
95-
{% data variables.product.prodname_pages %} sites created after June 15, 2016 and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
95+
{% data variables.product.prodname_pages %} sites created after June 15, 2016, and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
9696

9797
### Prohibited uses
9898
{% endif %}
99-
{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
99+
{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web-hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
100100

101-
In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get rich quick schemes, sexually obscene content, and violent or threatening content or activity.
101+
In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get-rich-quick schemes, sexually obscene content, and violent or threatening content or activity.
102102

103103
### Usage limits
104104
{% data variables.product.prodname_pages %} sites are subject to the following usage limits:
105105

106-
- {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?"](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations){% endif %}
106+
- {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1 GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations)"{% endif %}
107107
- Published {% data variables.product.prodname_pages %} sites may be no larger than 1 GB.
108108
{% ifversion fpt or ghec %}
109-
- {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100GB per month.
109+
- {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100 GB per month.
110110
- {% data variables.product.prodname_pages %} sites have a *soft* limit of 10 builds per hour.
111111

112112
If your site exceeds these usage quotas, we may not be able to serve your site, or you may receive a polite email from {% data variables.contact.contact_support %} suggesting strategies for reducing your site's impact on our servers, including putting a third-party content distribution network (CDN) in front of your site, making use of other {% data variables.product.prodname_dotcom %} features such as releases, or moving to a different hosting service that might better fit your needs.

content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Configuring tag protection rules
33
shortTitle: Configure tag rules
44
intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags.
5+
product: '{% data reusables.gated-features.tag-protection-rules %}'
56
versions:
67
fpt: '*'
78
ghes: '>3.4'

0 commit comments

Comments
 (0)