Skip to content

Commit f1628d7

Browse files
authored
Merge branch 'main' into warn-about-renaming-action-branches
2 parents b8642c9 + 2095839 commit f1628d7

24 files changed

Lines changed: 5367 additions & 5378 deletions

content/actions/reference/encrypted-secrets.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ You can check which access policies are being applied to a secret in your organi
126126

127127
### Using encrypted secrets in a workflow
128128

129-
{% data reusables.actions.forked-secrets %}
129+
{% note %}
130+
131+
**Note:** {% data reusables.actions.forked-secrets %}
132+
133+
{% endnote %}
130134

131135
To provide an action with a secret as an input or environment variable, you can use the `secrets` context to access secrets you've created in your repository. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)" and "[Workflow syntax for {% data variables.product.prodname_actions %}](/github/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions)."
132136

content/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ After adding a new SSH key to your {% data variables.product.product_name %} acc
1919

2020
{% data reusables.ssh.dsa-support %}
2121

22+
{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
23+
{% tip %}
24+
25+
**Tip**: You can also add an SSH key using the {% data variables.product.prodname_cli %}. For more information, see "[`gh ssh-key add`](https://cli.github.com/manual/gh_ssh-key_add)" in the {% data variables.product.prodname_cli %} documentation.
26+
27+
{% endtip %}
28+
{% endif %}
29+
2230
{% mac %}
2331

2432
1. Copy the SSH public key to your clipboard.

content/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ topics:
1717

1818
{% data reusables.pull_requests.mark-ready-review %}
1919

20+
{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
21+
{% tip %}
22+
23+
**Tip**: You can also mark a pull request as ready for review using the {% data variables.product.prodname_cli %}. For more information, see "[`gh pr ready`](https://cli.github.com/manual/gh_pr_ready)" in the {% data variables.product.prodname_cli %} documentation.
24+
25+
{% endtip %}
26+
{% endif %}
27+
2028
{% data reusables.repositories.sidebar-pr %}
2129
2. In the "Pull requests" list, click the pull request you'd like to mark as ready for review.
2230
3. In the merge box, click **Ready for review**.

content/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ topics:
1818

1919
{% endnote %}
2020

21+
{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
22+
{% tip %}
23+
24+
**Tip**: You can also check out a pull request locally using the {% data variables.product.prodname_cli %}. For more information, see "[`gh pr checkout`](https://cli.github.com/manual/gh_pr_checkout)" in the {% data variables.product.prodname_cli %} documentation.
25+
26+
{% endtip %}
27+
{% endif %}
28+
2129
### Modifying an active pull request locally
2230

2331
{% data reusables.repositories.sidebar-pr %}

content/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ You can specify which branch you'd like to merge your changes into when you crea
1919

2020
{% data reusables.pull_requests.close-issues-using-keywords %}
2121

22+
{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
23+
{% tip %}
24+
25+
**Tip**: You can create a pull request using the {% data variables.product.prodname_cli %}. For more information, see "[`gh pr create`](https://cli.github.com/manual/gh_pr_create)" in the {% data variables.product.prodname_cli %} documentation.
26+
27+
{% endtip %}
28+
{% endif %}
29+
2230
### Changing the branch range and destination repository
2331

2432
By default, pull requests are based on the parent repository's default branch. For more information, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)."

content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ You can't merge a draft pull request. For more information about draft pull requ
2525

2626
If you decide you don't want the changes in a topic branch to be merged to the upstream branch, you can [close the pull request](/articles/closing-a-pull-request) without merging.
2727

28+
{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
29+
{% tip %}
30+
31+
**Tip**: You can also merge a pull request using the {% data variables.product.prodname_cli %}. For more information, see "[`gh pr merge`](https://cli.github.com/manual/gh_pr_merge)" in the {% data variables.product.prodname_cli %} documentation.
32+
33+
{% endtip %}
34+
{% endif %}
35+
2836
### Merging a pull request on {% data variables.product.prodname_dotcom %}
2937

3038
{% data reusables.repositories.sidebar-pr %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
With the exception of `GITHUB_TOKEN`, secrets are not passed to the runner when a workflow is triggered from a forked repository.
1+
With the exception of `GITHUB_TOKEN`, secrets are not passed to the runner when a workflow is triggered from a forked repository.

0 commit comments

Comments
 (0)