Skip to content

Commit 300a201

Browse files
authored
repo sync
2 parents 2e47c25 + 1265954 commit 300a201

File tree

54 files changed

+363
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+363
-291
lines changed

content/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ featuredLinks:
166166
- Type: `Boolean`. Default is `false`.
167167
- Optional.
168168

169+
### `changelog`
170+
171+
- Purpose: Render a list of changelog items with timestamps on product pages (ex: `layouts/product-landing.html`)
172+
- Type: `Array`, items are objects `{ href: string, title: string, date: 'YYYY-MM-DD' }`
173+
- Optional.
174+
169175
### Escaping single quotes
170176

171177
If you see two single quotes in a row (`''`) in YML frontmatter where you might expect to see one (`'`), this is the YML-preferred way to escape a single quote. From [the YAML spec](https://yaml.org/spec/history/2001-12-10.html):

content/actions/index.md

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,30 @@ shortTitle: GitHub Actions
44
intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.'
55
introLinks:
66
quickstart: /actions/quickstart
7-
learn: /actions/learn-github-actions
7+
reference: /actions/reference
88
featuredLinks:
9+
guides:
10+
- /actions/guides/setting-up-continuous-integration-using-workflow-templates
11+
- /actions/guides/about-packaging-with-github-actions
912
gettingStarted:
1013
- /actions/managing-workflow-runs
1114
- /actions/hosting-your-own-runners
12-
guide:
13-
- /actions/guides/setting-up-continuous-integration-using-workflow-templates
14-
- /actions/guides/about-packaging-with-github-actions
1515
popular:
1616
- /actions/reference/workflow-syntax-for-github-actions
1717
- /actions/reference/events-that-trigger-workflows
18+
changelog:
19+
- title: Self-Hosted Runner Group Access Changes
20+
date: '2020-10-16'
21+
href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
22+
- title: Ability to change retention days for artifacts and logs
23+
date: '2020-10-08'
24+
href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
25+
- title: Deprecating set-env and add-path commands
26+
date: '2020-10-01'
27+
href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
28+
- title: Fine-tune access to external actions
29+
date: '2020-10-01'
30+
href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
1831
redirect_from:
1932
- /articles/automating-your-workflow-with-github-actions/
2033
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +49,8 @@ versions:
3649
<!-- {% link_with_intro /hosting-your-own-runners %} -->
3750
<!-- {% link_with_intro /reference %} -->
3851

39-
<!-- Article links -->
40-
<div class="d-lg-flex gutter my-6 py-6">
41-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
42-
<div class="featured-links-heading pb-4">
43-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.guides %}</h3>
44-
</div>
45-
<ul class="list-style-none">
46-
{% for link in featuredLinks.guide %}
47-
<li>{% include featured-link %}</li>
48-
{% endfor %}
49-
</ul>
50-
</div>
51-
52-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
53-
<div class="featured-links-heading pb-4">
54-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.popular_articles %}</h3>
55-
</div>
56-
<ul class="list-style-none">
57-
{% for link in featuredLinks.popular %}
58-
<li>{% include featured-link %}</li>
59-
{% endfor %}
60-
</ul>
61-
</div>
62-
63-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
64-
<div class="featured-links-heading pb-4">
65-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">Manage workflows</h3>
66-
</div>
67-
<ul class="list-style-none">
68-
{% for link in featuredLinks.gettingStarted %}
69-
<li>{% include featured-link %}</li>
70-
{% endfor %}
71-
</ul>
72-
</div>
73-
</div>
74-
7552
<!-- Code examples -->
76-
<div class="mt-6 pt-6">
53+
<div class="my-6 pt-6">
7754
<h2 class="mb-2">More guides</h2>
7855

7956
<div class="d-flex flex-wrap gutter">

content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Enabling alerts for vulnerable dependencies on GitHub Enterprise Server
3-
intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
3+
intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
44
redirect_from:
55
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
66
- /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
77
- /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server
8-
permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
8+
permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
99
versions:
1010
enterprise-server: '*'
1111
---
@@ -14,11 +14,11 @@ versions:
1414

1515
{% data reusables.repositories.tracks-vulnerabilities %} For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
1616

17-
You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
17+
You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
1818

19-
After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
19+
After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
2020

21-
{% if currentVersion ver_gt "[email protected]" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)."
21+
{% if currentVersion ver_gt "[email protected]" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)."
2222
{% endif %}
2323

2424
{% if currentVersion == "[email protected]" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)."
@@ -28,23 +28,25 @@ After connecting {% data variables.product.product_location %} to {% data variab
2828
{% endif %}
2929

3030
{% if currentVersion ver_gt "[email protected]" %}
31-
### Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
31+
### Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
3232
{% else %}
3333
### Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
3434
{% endif %}
3535

36-
Before enabling {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
36+
Before enabling {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
3737

3838
{% if currentVersion ver_gt "[email protected]" %}
3939

40-
{% if currentVersion ver_gt "[email protected]" %}We recommend configuring {% data variables.product.prodname_dependabot_short %} alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_short %} alerts as usual.{% endif %}
40+
{% if currentVersion ver_gt "[email protected]" %}We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.{% endif %}
4141

4242
{% if currentVersion == "[email protected]" %}We recommend configuring security alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive security alerts as usual.{% endif %}
4343

4444
{% endif %}
4545

4646
{% data reusables.enterprise_site_admin_settings.sign-in %}
47-
1. In the administrative shell, enable the {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
47+
48+
1. In the administrative shell, enable the {% if currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
49+
4850
``` shell
4951
$ ghe-dep-graph-enable
5052
```

content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ Now that you've created and published your repository, you're ready to make chan
9292

9393
4. At the bottom of the **Changes** list, enter a commit message. To the right of your profile picture, type a short description of the commit. Since we're changing the _README.md_ file, "Add information about purpose of project" would be a good commit summary. Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. Since you're making a basic update of a _README.md_ file, you can skip the description.
9494
![Commit message](/assets/images/help/desktop/getting-started-guide/commit-message.png)
95-
<<<<<<< HEAD
9695
5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want.
9796
![Commit to branch](/assets/images/help/desktop/getting-started-guide/click-commit-to-master.png)
98-
=======
99-
5. Click **Commit to master**. The commit button shows your current branch, which in this case is `master`, so that you know which branch you are making a commit to.
100-
![Commit to master](/assets/images/help/desktop/getting-started-guide/click-commit-to-master.png)
101-
>>>>>>> master
10297
6. To push your changes to the remote repository on {% data variables.product.product_name %}, click **Push origin**.
10398
![Push origin](/assets/images/help/desktop/getting-started-guide/push-to-origin.png)
10499
- The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}.

0 commit comments

Comments
 (0)