зеркало из https://github.com/github/docs.git
Remove {% ifversion fpt or ghec or ghes or ghae > 3.4 %} versioning
This commit is contained in:
Родитель
aacccc21c6
Коммит
56631406b1
|
@ -46,17 +46,10 @@ You can send an invitation to collaborate in your repository directly to someone
|
|||
1. Ask for the username of the person you're inviting as a collaborator.{% ifversion fpt or ghec %} If they don't have a username yet, they can sign up for {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/get-started/signing-up-for-github/signing-up-for-a-new-github-account)."{% endif %}
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4%}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "people" aria-hidden="true" %} Collaborators**.
|
||||
1. Click **Add people**.
|
||||
1. In the search field, start typing the name of person you want to invite, then click a name in the list of matches.
|
||||
1. Click **Add NAME to REPOSITORY**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Collaborators**.
|
||||
1. Under "Collaborators", start typing the collaborator's username.
|
||||
1. Select the collaborator's username from the dropdown menu.
|
||||
1. Click **Add collaborator**.
|
||||
{% endif %}
|
||||
{% ifversion fpt or ghec %}
|
||||
1. The user will receive an email inviting them to the repository. Once they accept your invitation, they will have collaborator access to your repository.
|
||||
{% endif %}
|
||||
|
|
|
@ -30,13 +30,8 @@ While forks of private repositories are deleted when a collaborator is removed,
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.click-collaborators-teams %}
|
||||
1. To the right of the collaborator you want to remove, click **Remove**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Collaborators & teams**.
|
||||
1. Next to the collaborator you want to remove, click {% octicon "x" aria-label="Remove" %}.
|
||||
{% endif %}
|
||||
|
||||
## Further reading
|
||||
|
||||
|
|
|
@ -21,10 +21,6 @@ topics:
|
|||
shortTitle: Remove yourself
|
||||
---
|
||||
{% data reusables.user-settings.access_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-hidden="true" %} Repositories**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Repositories**.
|
||||
{% endif %}
|
||||
1. Next to the repository you want to leave, click **Leave**.
|
||||
1. Read the warning carefully, then click **I understand, leave this repository.**
|
||||
|
|
|
@ -200,7 +200,7 @@ You call a reusable workflow by using the `uses` keyword. Unlike when you are us
|
|||
|
||||
[`jobs.<job_id>.uses`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_iduses)
|
||||
|
||||
You reference reusable workflow files using {% ifversion fpt or ghec or ghes or ghae > 3.4 %}one of the following syntaxes:{% else %}the syntax:{% endif %}
|
||||
You reference reusable workflow files using one of the following syntaxes:
|
||||
|
||||
{% data reusables.actions.reusable-workflow-calling-syntax %}
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ versions:
|
|||
ghae: '*'
|
||||
ghec: '*'
|
||||
---
|
||||
|
||||
|
||||
{% data reusables.actions.enterprise-github-hosted-runners %}
|
||||
|
||||
## About YAML syntax for workflows
|
||||
|
@ -1003,7 +1003,7 @@ Additional Docker container resource options. For a list of options, see "[`dock
|
|||
|
||||
## `jobs.<job_id>.uses`
|
||||
|
||||
The location and version of a reusable workflow file to run as a job. {% ifversion fpt or ghec or ghes or ghae > 3.4 %}Use one of the following syntaxes:{% endif %}
|
||||
The location and version of a reusable workflow file to run as a job. Use one of the following syntaxes:
|
||||
|
||||
{% data reusables.actions.reusable-workflow-calling-syntax %}
|
||||
|
||||
|
|
|
@ -17,11 +17,7 @@ shortTitle: Deploy keys
|
|||
---
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Security" section of the sidebar, click **{% octicon "key" aria-hidden="true" %} Deploy keys**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Deploy keys**.
|
||||
{% endif %}
|
||||
1. On the "Deploy keys" page, take note of the deploy keys associated with your account. For those that you don't recognize, or that are out of date, click **Delete**. If there are valid deploy keys you'd like to keep, click **Approve**.
|
||||
|
||||
For more information, see "[AUTOTITLE](/authentication/connecting-to-github-with-ssh/managing-deploy-keys)."
|
||||
|
|
|
@ -21,11 +21,7 @@ shortTitle: Review security log
|
|||
The security log lists all actions performed within the last 90 days.
|
||||
|
||||
{% data reusables.user-settings.access_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-hidden="true" %} Security log**.
|
||||
{% else %}
|
||||
1. In the user settings sidebar, click **Security log**.
|
||||
{% endif %}
|
||||
|
||||
## Searching your security log
|
||||
|
||||
|
|
|
@ -29,9 +29,7 @@ By default, {% data variables.product.prodname_code_scanning %} analyzes your co
|
|||
|
||||
Each alert highlights a problem with the code and the name of the tool that identified it. You can see the line of code that triggered the alert, as well as properties of the alert, such as the alert severity, security severity, and the nature of the problem. Alerts also tell you when the issue was first introduced. For alerts identified by {% data variables.product.prodname_codeql %} analysis, you will also see information on how to fix the problem.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.code-scanning.alert-default-branch %}
|
||||
{% endif %}
|
||||
|
||||
{% ifversion fpt or ghec or ghes > 3.8 %}
|
||||
![Screenshot showing the elements of a {% data variables.product.prodname_code_scanning %} alert, including the title of the alert and relevant lines of code at left and the severity level, affected branches, and weaknesses at right. ](/assets/images/help/repository/code-scanning-alert.png)
|
||||
|
|
|
@ -39,8 +39,7 @@ By default, the code scanning alerts page is filtered to show alerts for the def
|
|||
{% data reusables.repositories.sidebar-code-scanning-alerts %}
|
||||
1. Optionally, use the free text search box or the drop-down menus to filter alerts. For example, you can filter by the tool that was used to identify alerts.
|
||||
{% data reusables.code-scanning.explore-alert %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.code-scanning.alert-default-branch %}{% endif %}
|
||||
{% data reusables.code-scanning.alert-default-branch %}
|
||||
1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used.
|
||||
![Screenshot of a {% data variables.product.prodname_code_scanning %} alert. The "Show paths" link is highlighted with a dark orange outline. The "Show more" link, described in the next step, is also highlighted.](/assets/images/help/repository/code-scanning-alert-details.png)
|
||||
|
||||
|
@ -74,9 +73,7 @@ When you select a keyword from either a drop-down list, or as you enter a keywor
|
|||
|
||||
If you enter multiple filters, the view will show alerts matching _all_ these filters. For example, `is:closed severity:high branch:main` will only display closed high-severity alerts that are present on the `main` branch. The exception is filters relating to refs (`ref`, `branch` and `pr`): `is:open branch:main branch:next` will show you open alerts from both the `main` branch and the `next` branch.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.code-scanning.filter-non-default-branches %}
|
||||
{% endif %}
|
||||
|
||||
{% ifversion fpt or ghes or ghec %}
|
||||
|
||||
|
@ -143,9 +140,7 @@ Alerts may be fixed in one branch but not in another. You can use the "Branch" f
|
|||
|
||||
![Screenshot of the search field on the {% data variables.product.prodname_code_scanning %}, with the "Branch" dropdown menu expanded. The "Branch" button is outlined in dark orange.](/assets/images/help/repository/code-scanning-branch-filter.png)
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.code-scanning.filter-non-default-branches %}
|
||||
{% endif %}
|
||||
|
||||
{% ifversion fpt or ghes or ghae > 3.4 or ghec %}
|
||||
{% note %}
|
||||
|
|
|
@ -93,17 +93,11 @@ If you have write permission for the repository, some annotations contain links
|
|||
|
||||
To see more information about an alert, users with write permission can click the **Show more details** link shown in the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.code-scanning.alert-default-branch %}
|
||||
{% endif %}
|
||||
|
||||
In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
![Screenshot showing the description for a {% data variables.product.prodname_code_scanning %} alert. A link labeled "Show more" is highlighted with a dark orange outline.](/assets/images/help/repository/code-scanning-pr-alert.png)
|
||||
{% else %}
|
||||
![Alert description and link to show more information.](/assets/images/enterprise/3.4/repository/code-scanning-pr-alert.png)
|
||||
{% endif %}
|
||||
|
||||
{% ifversion code-scanning-pr-conversations-tab %}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ topics:
|
|||
{% data reusables.dependabot.beta-security-and-version-updates %}
|
||||
{% data reusables.dependabot.enterprise-enable-dependabot %}
|
||||
|
||||
Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %}{% ifversion fpt or ghec or ghes %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}{% endif %}. You can{% ifversion fpt or ghec or ghes or ghae > 3.4 %} filter alerts by package, ecosystem, or manifest. You can {% endif %} sort the list of alerts, and you can click into specific alerts for more details. {% ifversion dependabot-bulk-alerts %}You can also dismiss or reopen alerts, either one by one or by selecting multiple alerts at once.{% else %}You can also dismiss or reopen alerts. {% endif %} For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)."
|
||||
Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %}{% ifversion fpt or ghec or ghes %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}{% endif %}. You can filter alerts by package, ecosystem, or manifest. You can sort the list of alerts, and you can click into specific alerts for more details. {% ifversion dependabot-bulk-alerts %}You can also dismiss or reopen alerts, either one by one or by selecting multiple alerts at once.{% else %}You can also dismiss or reopen alerts. {% endif %} For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)."
|
||||
|
||||
{% ifversion fpt or ghec or ghes %}
|
||||
You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates)."
|
||||
|
@ -40,15 +40,13 @@ You can enable automatic security updates for any repository that uses {% data v
|
|||
|
||||
Each {% data variables.product.prodname_dependabot %} alert has a unique numeric identifier and the {% data variables.product.prodname_dependabot_alerts %} tab lists an alert for every detected vulnerability. Legacy {% data variables.product.prodname_dependabot_alerts %} grouped vulnerabilities by dependency and generated a single alert per dependency. If you navigate to a legacy {% data variables.product.prodname_dependabot %} alert, you will be redirected to a {% data variables.product.prodname_dependabot_alerts %} tab filtered for that package. {% endif %}
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
You can filter and sort {% data variables.product.prodname_dependabot_alerts %} using a variety of filters and sort options available on the user interface. For more information, see "[Prioritizing {% data variables.product.prodname_dependabot_alerts %}](#prioritizing-across--data-variablesproductprodname_dependabot_alerts-)" below.
|
||||
|
||||
You can also audit actions taken in response to {% data variables.product.prodname_dependabot %} alerts. For more information, see "[AUTOTITLE](/code-security/getting-started/auditing-security-alerts)."
|
||||
|
||||
## Prioritizing {% data variables.product.prodname_dependabot_alerts %}
|
||||
|
||||
{% data variables.product.company_short %} helps you prioritize fixing {% data variables.product.prodname_dependabot_alerts %}. {% ifversion dependabot-most-important-sort-option %} By default, {% data variables.product.prodname_dependabot_alerts %} are sorted by importance. The "Most important" sort order helps you prioritize which {% data variables.product.prodname_dependabot_alerts %} to focus on first. Alerts are ranked based on their potential impact, actionability, and relevance. Our prioritization calculation is constantly being improved and includes factors like CVSS score, dependency scope, and whether vulnerable function calls are found for the alert.{% endif %}
|
||||
|
||||
{% data variables.product.company_short %} helps you prioritize fixing {% data variables.product.prodname_dependabot_alerts %}. {% ifversion dependabot-most-important-sort-option %} By default, {% data variables.product.prodname_dependabot_alerts %} are sorted by importance. The "Most important" sort order helps you prioritize which {% data variables.product.prodname_dependabot_alerts %} to focus on first. Alerts are ranked based on their potential impact, actionability, and relevance. Our prioritization calculation is constantly being improved and includes factors like CVSS score, dependency scope, and whether vulnerable function calls are found for the alert.
|
||||
{% ifversion dependabot-alert-rules-auto-dismissal-npm-dev-dependencies %}
|
||||
You can also use alert rules to prioritize {% data variables.product.prodname_dependabot_alerts %}. For more information, see “[AUTOTITLE](/code-security/dependabot/dependabot-alerts/using-alert-rules-to-prioritize-dependabot-alerts).”
|
||||
{% endif %}
|
||||
|
@ -114,7 +112,6 @@ For more information, see "[Reviewing and fixing alerts](#reviewing-and-fixing-a
|
|||
|
||||
## Viewing {% data variables.product.prodname_dependabot_alerts %}
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-security %}
|
||||
{% data reusables.repositories.sidebar-dependabot-alerts %}
|
||||
|
@ -123,10 +120,6 @@ For more information, see "[Reviewing and fixing alerts](#reviewing-and-fixing-a
|
|||
{%- ifversion dependabot-bulk-alerts %}
|
||||
![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png){% endif %}
|
||||
1. Click the alert that you would like to view.
|
||||
{% else %}
|
||||
{% data reusables.dependabot.navigate-to-dependabot-alerts %}
|
||||
1. Click the alert you'd like to view.
|
||||
{% endif %}
|
||||
{% ifversion dependabot-filter-label-security-advisory %}
|
||||
1. Optionally, to suggest an improvement to the related security advisory, on the right-hand side of the alert details page, click **Suggest improvements for this advisory on the {% data variables.product.prodname_advisory_database %}**. For more information, see "[AUTOTITLE](/code-security/security-advisories/global-security-advisories/editing-security-advisories-in-the-github-advisory-database)."
|
||||
|
||||
|
|
|
@ -69,11 +69,7 @@ You can manually link up to ten issues to each pull request. The issue and pull
|
|||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-pr %}
|
||||
1. In the list of pull requests, click the pull request that you'd like to link to an issue.
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.pull_requests.click-development %}
|
||||
{% else %}
|
||||
1. In the right sidebar, click **Linked issues**.
|
||||
{% endif %}
|
||||
1. Click the issue you want to link to the pull request.
|
||||
|
||||
{% ifversion link-existing-branches-to-issue %}
|
||||
|
|
|
@ -29,9 +29,7 @@ When {% data variables.projects.projects_v1_boards %} are disabled, you will no
|
|||
|
||||
{% data reusables.profile.access_org %}
|
||||
{% data reusables.profile.org_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
|
||||
{% endif %}
|
||||
1. Decide whether to disable {% data variables.projects.projects_v2_and_v1 %} in your organization. Then, under **Projects{% ifversion ghes = 3.7 %} (classic){% endif %}**:
|
||||
- To disable {% data variables.projects.projects_v2_and_v1 %}, unselect **Enable Projects{% ifversion ghes = 3.7 %} (classic){% endif %} for the organization**.
|
||||
- To enable {% data variables.projects.projects_v2_and_v1 %} in the organization, select **Enable Projects{% ifversion ghes = 3.7 %} (classic){% endif %} for the organization**.
|
||||
|
@ -47,9 +45,7 @@ You can control whether organization members can create {% data variables.projec
|
|||
|
||||
{% data reusables.profile.access_org %}
|
||||
{% data reusables.profile.org_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
|
||||
{% endif %}
|
||||
1. Decide whether to allow members to create {% data variables.projects.projects_v1_boards %} in repositories in your organization. Then, under **{%ifversion ghes > 3.7 or ghae > 3.7 or ghec or fpt %}Projects (classic) only{% elsif ghes = 3.7 %}Repository projects{% else %}Projects{% endif %}**:
|
||||
- To enable project boards in repositories, select **{% ifversion ghes < 3.7 %}Enable projects for all repositories{% else %}Allow members to enable Projects (classic) for all repositories{% endif %}**.
|
||||
- To disable project boards in repositories, unselect **{% ifversion ghes < 3.7 %}Enable projects for all repositories{% else %}Allow members to enable Projects (classic) for all repositories{% endif %}**.
|
||||
|
|
|
@ -55,11 +55,7 @@ Any team members that have set their status to "Busy" will not be selected for r
|
|||
{% data reusables.user-settings.access_org %}
|
||||
{% data reusables.organizations.specific_team %}
|
||||
{% data reusables.organizations.team_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, click **{% octicon "code-review" aria-hidden="true" %} Code review**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Code review**
|
||||
{% endif %}
|
||||
1. Select **Only notify requested team members.**
|
||||
1. Click **Save changes**.
|
||||
{% endif %}
|
||||
|
@ -70,11 +66,7 @@ Any team members that have set their status to "Busy" will not be selected for r
|
|||
{% data reusables.user-settings.access_org %}
|
||||
{% data reusables.organizations.specific_team %}
|
||||
{% data reusables.organizations.team_settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, click **{% octicon "code-review" aria-hidden="true" %} Code review**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Code review**
|
||||
{% endif %}
|
||||
1. Select **Enable auto assignment**.
|
||||
1. Under "How many team members should be assigned to review?", select the dropdown menu and choose a number of reviewers to be assigned to each pull request.
|
||||
1. Under "Routing algorithm", use the dropdown menu and choose which algorithm you'd like to use. For more information, see "[Routing algorithms](#routing-algorithms)."
|
||||
|
|
|
@ -20,25 +20,18 @@ You can update a pull request's head branch from the command line or the pull re
|
|||
|
||||
- There are no merge conflicts between the pull request branch and the base branch.
|
||||
- The pull request branch is not up to date with the base branch.
|
||||
- The base branch requires branches to be up to date before merging{% ifversion fpt or ghec or ghes or ghae > 3.4 %} or the setting to always suggest updating branches is enabled{% endif %}.
|
||||
- The base branch requires branches to be up to date before merging or the setting to always suggest updating branches is enabled.
|
||||
|
||||
For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches){% ifversion fpt or ghec or ghes or ghae > 3.4 %}" and "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches){% endif %}."
|
||||
For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches)" and "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches)."
|
||||
|
||||
If there are changes to the base branch that cause merge conflicts in your pull request branch, you will not be able to update the branch until all conflicts are resolved. For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts)."
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
From the pull request page you can update your pull request's branch using a traditional merge or by rebasing. A traditional merge results in a merge commit that merges the base branch into the head branch of the pull request. Rebasing applies the changes from _your_ branch onto the latest version of the base branch. The result is a branch with a linear history, since no merge commit is created.
|
||||
{% else %}
|
||||
Updating your branch from the pull request page performs a traditional merge. The resulting merge commit merges the base branch into the head branch of the pull request.
|
||||
{% endif %}
|
||||
|
||||
## Updating your pull request branch
|
||||
|
||||
{% data reusables.repositories.sidebar-pr %}
|
||||
|
||||
1. In the "Pull requests" list, click the pull request you'd like to update.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the merge section near the bottom of the page, you can:
|
||||
- Click **Update branch** to perform a traditional merge.
|
||||
|
||||
|
@ -47,11 +40,6 @@ Updating your branch from the pull request page performs a traditional merge. Th
|
|||
- Click the update branch drop down menu, click **Update with rebase**, and then click **Rebase branch** to update by rebasing on the base branch.
|
||||
|
||||
![Screenshot of the merge section for a pull request. The dropdown menu is expanded, showing "Update with merge commit" and "Update with rebase" options.](/assets/images/help/pull_requests/pull-request-update-branch-rebase-option.png)
|
||||
{% else %}
|
||||
1. In the merge section near the bottom of the page, click **Update branch** to perform a traditional merge.
|
||||
|
||||
![Screenshot of the merge section for a pull request.](/assets/images/help/pull_requests/pull-request-update-branch.png)
|
||||
{% endif %}
|
||||
|
||||
## Further reading
|
||||
|
||||
|
|
|
@ -25,4 +25,4 @@ If you allow auto-merge for pull requests in your repository, people with write
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
1. Under {% ifversion fpt or ghec or ghes or ghae > 3.4 %}"Pull Requests"{% else %}"Merge button"{% endif %}, select or deselect **Allow auto-merge**.
|
||||
1. Under "Pull Requests", select or deselect **Allow auto-merge**.
|
||||
|
|
|
@ -18,7 +18,7 @@ Anyone with admin permissions to a repository can enable or disable the automati
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
1. Under {% ifversion fpt or ghec or ghes or ghae > 3.4 %}"Pull Requests"{% else %}"Merge button"{% endif %}, select or unselect **Automatically delete head branches**.
|
||||
1. Under "Pull Requests", select or unselect **Automatically delete head branches**.
|
||||
|
||||
## Further reading
|
||||
|
||||
|
|
|
@ -34,11 +34,7 @@ This procedure demonstrates how to configure autolinks to reference external res
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Integrations" section of the sidebar, click **{% octicon "cross-reference" aria-hidden="true" %} Autolink references**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Autolink references**.
|
||||
{% endif %}
|
||||
1. At the top right of the page, click **Add autolink reference**.
|
||||
|
||||
![Screenshot of the "autolink references" page. The "Add autolink reference" button is highlighted by a dark orange outline.](/assets/images/help/repository/add-autolink-reference-details.png)
|
||||
|
|
|
@ -32,33 +32,21 @@ For more information about repository roles, see "[AUTOTITLE](/account-and-profi
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.click-collaborators-teams %}
|
||||
{% else %}
|
||||
{% data reusables.repositories.navigate-to-manage-access %}
|
||||
{% endif %}
|
||||
1. Under "Manage access", in the search field, start typing the name of the team or person you'd like to find. Optionally, use the dropdown menus to filter your search.
|
||||
|
||||
## Changing permissions for a team or person
|
||||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.click-collaborators-teams %}
|
||||
{% else %}
|
||||
{% data reusables.repositories.navigate-to-manage-access %}
|
||||
{% endif %}
|
||||
1. Under "Manage access", next to the team or person whose role you'd like to change, select the **Role** dropdown menu, and click a new role.
|
||||
|
||||
## Inviting a team or person
|
||||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.click-collaborators-teams %}
|
||||
{% else %}
|
||||
{% data reusables.repositories.navigate-to-manage-access %}
|
||||
{% endif %}
|
||||
{% data reusables.organizations.invite-teams-or-people %}
|
||||
1. In the search field, start typing the name of the team or person to invite, then click a name in the list of matches.
|
||||
1. Under "Choose a role", select the repository role to grant to the team or person, then click **Add NAME to REPOSITORY**.
|
||||
|
@ -67,11 +55,7 @@ For more information about repository roles, see "[AUTOTITLE](/account-and-profi
|
|||
|
||||
{% data reusables.repositories.navigate-to-repo %}
|
||||
{% data reusables.repositories.sidebar-settings %}
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
{% data reusables.repositories.click-collaborators-teams %}
|
||||
{% else %}
|
||||
{% data reusables.repositories.navigate-to-manage-access %}
|
||||
{% endif %}
|
||||
1. Under "Manage access", next to the team or person whose access you'd like to remove, click **Remove**.
|
||||
|
||||
## Further reading
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
|
||||
{% note %}
|
||||
|
||||
**Note:** To enhance security, {% data variables.product.prodname_actions %} does not support redirects for actions or reusable workflows. This means that when the owner, name of an action's repository, or name of an action is changed, any workflows using that action with the previous name will fail.
|
||||
|
||||
{% endnote %}
|
||||
|
||||
{% endif %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- `{owner}/{repo}/.github/workflows/{filename}@{ref}`{% ifversion fpt or ghec or ghes or ghae > 3.4 %} for reusable workflows in {% ifversion fpt %}public and private{% elsif ghec or ghes > 3.7 or ghae > 3.7 %}public, internal and private{% else %}public and internal{% endif %} repositories.
|
||||
- `./.github/workflows/{filename}` for reusable workflows in the same repository.{% endif %}
|
||||
- `{owner}/{repo}/.github/workflows/{filename}@{ref}` for reusable workflows in {% ifversion fpt %}public and private{% elsif ghec or ghes > 3.7 or ghae > 3.7 %}public, internal and private{% else %}public and internal{% endif %} repositories.
|
||||
- `./.github/workflows/{filename}` for reusable workflows in the same repository.
|
||||
|
||||
`{ref}` can be a SHA, a release tag, or a branch name. Using the commit SHA is the safest for stability and security. For more information, see "[AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#reusing-third-party-workflows)."{% ifversion fpt or ghec or ghes or ghae > 3.4 %} If you use the second syntax option (without `{owner}/{repo}` and `@{ref}`) the called workflow is from the same commit as the caller workflow.{% endif %} Ref prefixes such as `refs/heads` and `refs/tags` are not allowed.
|
||||
`{ref}` can be a SHA, a release tag, or a branch name. Using the commit SHA is the safest for stability and security. For more information, see "[AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#reusing-third-party-workflows)." If you use the second syntax option (without `{owner}/{repo}` and `@{ref}`) the called workflow is from the same commit as the caller workflow. Ref prefixes such as `refs/heads` and `refs/tags` are not allowed.
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
{% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%}
|
||||
1. In the left sidebar, click {% ifversion fpt or ghec or ghes or ghae > 3.4 %}{% octicon "play" aria-hidden="true" %} **Actions**, then click **General**.{% else %}**Actions**.{% endif %}
|
||||
1. In the left sidebar, click {% octicon "play" aria-hidden="true" %} **Actions**, then click **General**.
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
{% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%}
|
||||
1. In the left sidebar, click {% ifversion fpt or ghec or ghes or ghae > 3.4 %}{% octicon "play" aria-hidden="true" %} **Actions**, then click **Runners**.{% else %}**Actions**.{% ifversion ghes or ghae %}
|
||||
1. In the left sidebar, under "Actions", click **Runners**.{% endif %}{% endif %}
|
||||
1. In the left sidebar, click {% octicon "play" aria-hidden="true" %} **Actions**, then click **Runners**.
|
||||
|
|
|
@ -4,6 +4,4 @@
|
|||
1. You can click **More options {% octicon "chevron-down" aria-label="down" %}** to provide other surrounding content or additional match requirements for the secret format.
|
||||
1. Provide a sample test string to make sure your configuration is matching the patterns you expect.
|
||||
|
||||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
![Screenshot of a filled custom {% data variables.product.prodname_secret_scanning %} pattern form.](/assets/images/help/repository/secret-scanning-create-custom-pattern.png)
|
||||
{% endif %}
|
||||
|
|
|
@ -1 +1 @@
|
|||
1. When you're satisfied with your new custom pattern, click {% ifversion fpt or ghec or ghes or ghae > 3.4 %}**Publish pattern**{% else %}**Create pattern**{% endif %}.
|
||||
1. When you're satisfied with your new custom pattern, click **Publish pattern**.
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Archives" section of the sidebar, click {% octicon "log" aria-hidden="true" %} **Logs**, then click **Audit log**.
|
||||
{% else %}
|
||||
1. In the Settings sidebar, click **Audit log**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-hidden="true" %} Security log**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Audit log**.
|
||||
{% endif %}
|
||||
|
|
|
@ -9,4 +9,4 @@ You can also enable or disable the dependency graph for all repositories owned b
|
|||
|
||||
![Screenshot showing how to enable the dependency graph for a repository. The "Enable" button is highlighted with a dark orange outline.](/assets/images/help/repository/dependency-graph-enable-button.png)
|
||||
|
||||
You can disable the dependency graph at any time by clicking **Disable** next to "Dependency Graph" on the settings page for {% ifversion fpt or ghec or ghes or ghae > 3.4 %}"Code security and analysis."{% else %}"Security & analysis."{% endif %}
|
||||
You can disable the dependency graph at any time by clicking **Disable** next to "Dependency Graph" on the settings page for "Code security and analysis."
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Security" section of the sidebar, select {% ifversion actions-configuration-variables %}**{% octicon "key-asterisk" aria-hidden="true" %} Secrets and variables**, {% else %}**{% octicon "key-asterisk" aria-hidden="true"%} Secrets**, {% endif %}then click **{% data variables.product.prodname_dependabot %}**.
|
||||
{% else %}
|
||||
1. In the sidebar, click **{% data variables.product.prodname_dependabot %}**.
|
||||
{% endif %}
|
||||
1. In the "Security" section of the sidebar, select {% ifversion actions-configuration-variables %}**{% octicon "key-asterisk" aria-hidden="true" %} Secrets and variables**, {% else %}**{% octicon "key-asterisk" aria-hidden="true"%} Secrets**, {% endif %}then click **{% data variables.product.prodname_dependabot %}**.
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, select **{% octicon "code" aria-hidden="true" %} Developer settings** then click **{% data variables.product.prodname_github_apps %}**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **{% data variables.product.prodname_github_apps %}**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "people" aria-hidden="true" %} Member privileges**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Member privileges**.
|
||||
{% endif %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "people" aria-hidden="true" %} Member privileges**.
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-hidden="true" %} Repository**, then click **Repository defaults**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Repository defaults**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "comment-discussion" aria-hidden="true" %} Team discussions**.
|
||||
{% else %}
|
||||
1. In the Settings sidebar, click **Teams**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Security" section of the sidebar, click **{% octicon "verified" aria-hidden="true" %} Verified and approved domains**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Verified & approved domains**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code and automation" section of the sidebar, click **{% octicon "git-branch" aria-hidden="true" %} Branches**.
|
||||
{% else %}
|
||||
1. In the left menu, click **Branches**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-hidden="true" %} Applications**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Applications**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, click **{% octicon "gear" aria-hidden="true" %} Account**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Account**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, click **{% octicon "paintbrush" aria-hidden="true" %} Appearance**.
|
||||
{% else %}
|
||||
1. In the user settings sidebar, click **Appearance**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the left sidebar, click **{% octicon "code" aria-hidden="true" %} Developer settings**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Developer settings**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "mail" aria-hidden="true" %} Emails**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Emails**.
|
||||
{% endif %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "mail" aria-hidden="true" %} Emails**.
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-hidden="true" %} Organizations**.
|
||||
{% else %}
|
||||
1. In your user settings sidebar, click **Organizations**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "repo" aaria-hidden="true" %} Repositories**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Repositories**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "reply" aria-hidden="true" %} Saved replies**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Saved replies**.
|
||||
{% endif %}
|
||||
1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "reply" aria-hidden="true" %} Saved replies**.
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-hidden="true"%} Code security and analysis**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Security & analysis**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "shield-lock" aria-hidden="true" %} Password and authentication**.
|
||||
{% else %}
|
||||
1. In the left sidebar, click **Account security**.
|
||||
{% endif %}
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
{% ifversion fpt or ghec or ghes or ghae > 3.4 %}
|
||||
1. In the "Access" section of the sidebar, click **{% octicon "key" aria-hidden="true" %} SSH and GPG keys**.
|
||||
{% else %}
|
||||
1. In the user settings sidebar, click **SSH and GPG keys**.
|
||||
{% endif %}
|
||||
|
|
Загрузка…
Ссылка в новой задаче