From 8e6f310e63609dd35e55cfb2cf557bf04f41157d Mon Sep 17 00:00:00 2001 From: Sarah Edwards Date: Mon, 29 Apr 2024 11:52:53 -0700 Subject: [PATCH 1/3] Fix broken site policy link (#50352) --- .../github-statement-against-modern-slavery-and-child-labor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/site-policy/github-company-policies/github-statement-against-modern-slavery-and-child-labor.md b/content/site-policy/github-company-policies/github-statement-against-modern-slavery-and-child-labor.md index b8d9f2d540c6..2476b5fc5d24 100644 --- a/content/site-policy/github-company-policies/github-statement-against-modern-slavery-and-child-labor.md +++ b/content/site-policy/github-company-policies/github-statement-against-modern-slavery-and-child-labor.md @@ -18,7 +18,7 @@ According to the International Labour Organization (ILO), [40 million people wer GitHub deplores the presence and persistence of modern slavery and child labor, and takes seriously its responsibility to ensure that neither modern slavery nor child labor takes place in its supply chain or in any part of its business. ("Modern slavery" in this statement refers to slavery, forced or compulsory labor, trafficking, servitude, and workers who are imprisoned, indentured, or bonded. "Child labor" refers to work performed by someone under 16 years of age, or under 14 for light work, provided it is not confined to periods that interfere with the child's schooling and not in conditions that interfere with the child's health or well-being.) -In accordance with the [UK Modern Slavery Act](https://www.legislation.gov.uk/ukpga/2015/30/section/54/enacted), and in alignment with the [ILO 2014 Protocol to its Forced Labour Convention](https://www.ilo.org/dyn/normlex/en/f?p=NORMLEXPUB:12100:0::NO::P12100_ILO_CODE:P029), [ILO Declaration on Fundamental Principles and Rights at Work](https://www.ilo.org/declaration/lang--en/index.html), and [United Nations Sustainable Development Goals target 8.7](https://www.unodc.org/roseap/en/sustainable-development-goals.html#:~:text=Target%208.7%20%2D%20Take%20immediate%20and,labour%20in%20all%20its%20forms), this 2018 Statement Against Modern Slavery and Child Labor ("the Statement") describes the steps GitHub has taken to prevent modern slavery and child labor from occurring in its business or supply chain. +In accordance with the [UK Modern Slavery Act](https://www.legislation.gov.uk/ukpga/2015/30/section/54/enacted), and in alignment with the [ILO 2014 Protocol to its Forced Labour Convention](https://www.ilo.org/dyn/normlex/en/f?p=NORMLEXPUB:12100:0::NO::P12100_ILO_CODE:P029), [ILO Declaration on Fundamental Principles and Rights at Work](https://www.ilo.org/ilo-declaration-fundamental-principles-and-rights-work), and [United Nations Sustainable Development Goals target 8.7](https://www.unodc.org/roseap/en/sustainable-development-goals.html#:~:text=Target%208.7%20%2D%20Take%20immediate%20and,labour%20in%20all%20its%20forms), this 2018 Statement Against Modern Slavery and Child Labor ("the Statement") describes the steps GitHub has taken to prevent modern slavery and child labor from occurring in its business or supply chain. ## GitHub's structure, business, and supply chains From fe9cfcd9f636d53a78ee3a3a976715ed9a253b8c Mon Sep 17 00:00:00 2001 From: Will Haltom Date: Mon, 29 Apr 2024 13:58:22 -0500 Subject: [PATCH 2/3] Update language for push actions trigger doc (#50058) Co-authored-by: Siara <108543037+SiaraMist@users.noreply.github.com> --- .../actions/using-workflows/events-that-trigger-workflows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/using-workflows/events-that-trigger-workflows.md b/content/actions/using-workflows/events-that-trigger-workflows.md index 7fc1f059fb0b..48b596394279 100644 --- a/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/content/actions/using-workflows/events-that-trigger-workflows.md @@ -938,7 +938,7 @@ jobs: {% note %} -**Note**: An event will not be created when you push more than three tags at once. +**Note**: Events will not be created if more than 5000 branches are pushed at once. Events will not be created for tags when more than three tags are pushed at once. {% endnote %} From d8885af9e275c6c95a6b8a73315484fc0783bd88 Mon Sep 17 00:00:00 2001 From: Patrick Knight Date: Mon, 29 Apr 2024 13:58:49 -0500 Subject: [PATCH 3/3] Update rulesets-bypass-step.md (#50173) Co-authored-by: Siara <108543037+SiaraMist@users.noreply.github.com> --- data/reusables/repositories/rulesets-bypass-step.md | 1 + 1 file changed, 1 insertion(+) diff --git a/data/reusables/repositories/rulesets-bypass-step.md b/data/reusables/repositories/rulesets-bypass-step.md index 701401e64f95..d9e6373570aa 100644 --- a/data/reusables/repositories/rulesets-bypass-step.md +++ b/data/reusables/repositories/rulesets-bypass-step.md @@ -3,6 +3,7 @@ You can grant certain roles, teams, or apps bypass permissions for your ruleset. - Repository admins or organization owners - The maintain or write role, or custom repository roles based on the write role - Teams +- Deploy keys - {% data variables.product.prodname_github_apps %}{% ifversion repo-rules-dependabot-bypass %} - {% data variables.product.prodname_dependabot %}. For more information about {% data variables.product.prodname_dependabot %}, see "[AUTOTITLE](/code-security/getting-started/dependabot-quickstart-guide)."{% endif %}