diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md index 78f74ca3f7..c00c16fcab 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md @@ -91,10 +91,7 @@ The contribution activity section includes a detailed timeline of your work, inc ![Contribution activity time filter](/assets/images/help/profile/contributions_activity_time_filter.png) -{% ifversion fpt or ghes or ghae or ghec %} - ## Viewing contributions from {% data variables.product.prodname_enterprise %} on {% data variables.product.prodname_dotcom_the_website %} If you use {% ifversion fpt or ghec %}{% data variables.product.prodname_ghe_server %}{% ifversion ghae %} or {% data variables.product.prodname_ghe_managed %}{% endif %}{% else %}{% data variables.product.product_name %}{% endif %} and your enterprise owner enables {% data variables.product.prodname_unified_contributions %}, you can send enterprise contribution counts from to your {% data variables.product.prodname_dotcom_the_website %} profile. For more information, see "[Sending enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile)." -{% endif %} diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index 6ea89ce25b..0318166508 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -28,15 +28,11 @@ The security log lists all actions performed within the last 90 days. ![Security log tab](/assets/images/help/settings/audit-log-tab.png) {% endif %} -{% ifversion fpt or ghae or ghes or ghec %} ## Searching your security log {% data reusables.audit_log.audit-log-search %} ### Search based on the action performed -{% else %} -## Understanding events in your security log -{% endif %} The events listed in your security log are triggered by your actions. Actions are grouped into the following categories: diff --git a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates.md b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates.md index f7d69d6de4..c72af1ee61 100644 --- a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates.md +++ b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates.md @@ -36,9 +36,7 @@ Using the template builder, you can specify a title and description for each tem With issue forms, you can create templates that have web form fields using the {% data variables.product.prodname_dotcom %} form schema. When a contributor opens an issue using an issue form, the form inputs are converted to a standard markdown issue comment. You can specify different input types and set inputs as required to help contributors open actionable issues in your repository. For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#creating-issue-forms)" and "[Syntax for issue forms](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms)." {% endif %} -{% ifversion fpt or ghae or ghes or ghec %} {% data reusables.repositories.issue-template-config %} For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser)." -{% endif %} Issue templates are stored on the repository's default branch, in a hidden `.github/ISSUE_TEMPLATE` directory. If you create a template in another branch, it will not be available for collaborators to use. Issue template filenames are not case sensitive, and need a *.md* extension.{% ifversion fpt or ghec %} Issue templates created with issue forms need a *.yml* extension.{% endif %} {% data reusables.repositories.valid-community-issues %} diff --git a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md index 066cfdc38d..7620665f59 100644 --- a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md +++ b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md @@ -21,12 +21,8 @@ shortTitle: Configure {% endif %} -{% ifversion fpt or ghae or ghes or ghec %} - ## Creating issue templates -{% endif %} - {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} 3. In the "Features" section, under "Issues," click **Set up templates**. @@ -71,7 +67,6 @@ Here is the rendered version of the issue form. {% endif %} -{% ifversion fpt or ghae or ghes or ghec %} ## Configuring the template chooser {% data reusables.repositories.issue-template-config %} @@ -110,7 +105,6 @@ Your configuration file will customize the template chooser when the file is mer {% data reusables.files.write_commit_message %} {% data reusables.files.choose_commit_branch %} {% data reusables.files.propose_new_file %} -{% endif %} ## Further reading diff --git a/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md b/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md index 1dff469f06..ab9085085c 100644 --- a/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md +++ b/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md @@ -238,8 +238,8 @@ While most of your API interaction should occur using your server-to-server inst * [List deployments](/rest/reference/deployments#list-deployments) * [Create a deployment](/rest/reference/deployments#create-a-deployment) -* [Get a deployment](/rest/reference/deployments#get-a-deployment){% ifversion fpt or ghes or ghae or ghec %} -* [Delete a deployment](/rest/reference/deployments#delete-a-deployment){% endif %} +* [Get a deployment](/rest/reference/deployments#get-a-deployment) +* [Delete a deployment](/rest/reference/deployments#delete-a-deployment) #### Events @@ -421,14 +421,12 @@ While most of your API interaction should occur using your server-to-server inst * [Remove pre-receive hook enforcement for an organization](/enterprise/user/rest/reference/enterprise-admin#remove-pre-receive-hook-enforcement-for-an-organization) {% endif %} -{% ifversion fpt or ghes or ghae or ghec %} #### Organization Team Projects * [List team projects](/rest/reference/teams#list-team-projects) * [Check team permissions for a project](/rest/reference/teams#check-team-permissions-for-a-project) * [Add or update team project permissions](/rest/reference/teams#add-or-update-team-project-permissions) * [Remove a project from a team](/rest/reference/teams#remove-a-project-from-a-team) -{% endif %} #### Organization Team Repositories @@ -574,7 +572,7 @@ While most of your API interaction should occur using your server-to-server inst #### Reactions -{% ifversion fpt or ghes or ghae or ghec %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction-legacy){% else %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction){% endif %} +* [Delete a reaction](/rest/reference/reactions) * [List reactions for a commit comment](/rest/reference/reactions#list-reactions-for-a-commit-comment) * [Create reaction for a commit comment](/rest/reference/reactions#create-reaction-for-a-commit-comment) * [List reactions for an issue](/rest/reference/reactions#list-reactions-for-an-issue) @@ -586,13 +584,13 @@ While most of your API interaction should occur using your server-to-server inst * [List reactions for a team discussion comment](/rest/reference/reactions#list-reactions-for-a-team-discussion-comment) * [Create reaction for a team discussion comment](/rest/reference/reactions#create-reaction-for-a-team-discussion-comment) * [List reactions for a team discussion](/rest/reference/reactions#list-reactions-for-a-team-discussion) -* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion){% ifversion fpt or ghes or ghae or ghec %} +* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion) * [Delete a commit comment reaction](/rest/reference/reactions#delete-a-commit-comment-reaction) * [Delete an issue reaction](/rest/reference/reactions#delete-an-issue-reaction) * [Delete a reaction to a commit comment](/rest/reference/reactions#delete-an-issue-comment-reaction) * [Delete a pull request comment reaction](/rest/reference/reactions#delete-a-pull-request-comment-reaction) * [Delete team discussion reaction](/rest/reference/reactions#delete-team-discussion-reaction) -* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction){% endif %} +* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction) #### Repositories @@ -706,11 +704,9 @@ While most of your API interaction should occur using your server-to-server inst * [Get a repository README](/rest/reference/repos#get-a-repository-readme) * [Get the license for a repository](/rest/reference/licenses#get-the-license-for-a-repository) -{% ifversion fpt or ghes or ghae or ghec %} #### Repository Event Dispatches * [Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event) -{% endif %} #### Repository Hooks diff --git a/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index fc5166c4ed..517f94bf5d 100644 --- a/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -353,8 +353,8 @@ Webhook events are triggered based on the specificity of the domain you register ### Webhook payload object Key | Type | Description -----|------|-------------{% ifversion fpt or ghes or ghae or ghec %} -`action` |`string` | The action performed. Can be `created`.{% endif %} +----|------|------------- +`action` |`string` | The action performed. Can be `created`. `deployment` |`object` | The [deployment](/rest/reference/deployments#list-deployments). {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -378,8 +378,8 @@ Key | Type | Description ### Webhook payload object Key | Type | Description -----|------|-------------{% ifversion fpt or ghes or ghae or ghec %} -`action` |`string` | The action performed. Can be `created`.{% endif %} +----|------|------------- +`action` |`string` | The action performed. Can be `created`. `deployment_status` |`object` | The [deployment status](/rest/reference/deployments#list-deployment-statuses). `deployment_status["state"]` |`string` | The new state. Can be `pending`, `success`, `failure`, or `error`. `deployment_status["target_url"]` |`string` | The optional link added to the status. @@ -1152,7 +1152,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.release.published }} -{% ifversion fpt or ghes or ghae or ghec %} ## repository_dispatch This event occurs when a {% data variables.product.prodname_github_app %} sends a `POST` request to the "[Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event)" endpoint. @@ -1164,7 +1163,6 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends ### Webhook payload example {{ webhookPayloadsForCurrentVersion.repository_dispatch }} -{% endif %} ## repository diff --git a/content/get-started/getting-started-with-git/about-remote-repositories.md b/content/get-started/getting-started-with-git/about-remote-repositories.md index b706d97d92..612bb78690 100644 --- a/content/get-started/getting-started-with-git/about-remote-repositories.md +++ b/content/get-started/getting-started-with-git/about-remote-repositories.md @@ -81,14 +81,10 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit {% endtip %} -{% ifversion fpt or ghes or ghae or ghec %} - ## Cloning with {% data variables.product.prodname_cli %} You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} workflows in your terminal. For more information, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." -{% endif %} - {% ifversion not ghae %} ## Cloning with Subversion diff --git a/content/get-started/quickstart/communicating-on-github.md b/content/get-started/quickstart/communicating-on-github.md index 3f155a9a7e..a4328502c5 100644 --- a/content/get-started/quickstart/communicating-on-github.md +++ b/content/get-started/quickstart/communicating-on-github.md @@ -116,7 +116,6 @@ This example shows the {% data variables.product.prodname_discussions %} welcome This community maintainer started a discussion to welcome the community, and to ask members to introduce themselves. This post fosters an inviting atmosphere for visitors and contributors. The post also clarifies that the team's happy to help with contributions to the repository. {% endif %} -{% ifversion fpt or ghes or ghae or ghec %} ### Scenarios for team discussions - I have a question that's not necessarily related to specific files in the repository. @@ -139,8 +138,6 @@ The `octocat` team member posted a team discussion, informing the team of variou - There is a blog post describing how the teams use {% data variables.product.prodname_actions %} to produce their docs. - Material about the April All Hands is now available for all team members to view. -{% endif %} - ## Next steps These examples showed you how to decide which is the best tool for your conversations on {% data variables.product.product_name %}. But this is only the beginning; there is so much more you can do to tailor these tools to your needs. diff --git a/content/get-started/using-github/keyboard-shortcuts.md b/content/get-started/using-github/keyboard-shortcuts.md index 619f8d7304..61f7355658 100644 --- a/content/get-started/using-github/keyboard-shortcuts.md +++ b/content/get-started/using-github/keyboard-shortcuts.md @@ -30,7 +30,7 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a | Keyboard shortcut | Description |-----------|------------ |S or / | Focus the search bar. For more information, see "[About searching on {% data variables.product.company_short %}](/search-github/getting-started-with-searching-on-github/about-searching-on-github)." -|G N | Go to your notifications. For more information, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}." +|G N | Go to your notifications. For more information, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)." |Esc | When focused on a user, issue, or pull request hovercard, closes the hovercard and refocuses on the element the hovercard is in {% if command-palette %}|Command+K (Mac) or
Ctrl+K (Windows/Linux) | Opens the {% data variables.product.prodname_command_palette %}. If you are editing Markdown text, open the command palette with Command+Option+K or Ctrl+Alt+K. For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %} @@ -101,7 +101,6 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |Command+G (Mac) or
Ctrl+G (Windows/Linux) | Insert a suggestion. For more information, see "[Reviewing proposed changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)." |{% endif %} |R | Quote the selected text in your reply. For more information, see "[Basic writing and formatting syntax](/articles/basic-writing-and-formatting-syntax#quoting-text)." | - ## Issue and pull request lists | Keyboard shortcut | Description @@ -137,8 +136,8 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |J | Move selection down in the list |K | Move selection up in the list |Command+Shift+Enter | Add a single comment on a pull request diff | -|Alt and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down Alt and clicking **Show outdated** or **Hide outdated**.|{% ifversion fpt or ghes or ghae or ghec %} -|Click, then Shift and click | Comment on multiple lines of a pull request by clicking a line number, holding Shift, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."|{% endif %} +|Alt and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down Alt and clicking **Show outdated** or **Hide outdated**.| +|Click, then Shift and click | Comment on multiple lines of a pull request by clicking a line number, holding Shift, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."| ## Project boards @@ -195,7 +194,6 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr ## Notifications -{% ifversion fpt or ghes or ghae or ghec %} | Keyboard shortcut | Description |-----------|------------ |E | Mark as done @@ -203,13 +201,6 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |Shift+I| Mark as read |Shift+M | Unsubscribe -{% else %} - -| Keyboard shortcut | Description -|-----------|------------ -|E or I or Y | Mark as read -|Shift+M | Mute thread -{% endif %} ## Network graph diff --git a/content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md b/content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md index 00a5333f72..ce5486664c 100644 --- a/content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md +++ b/content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md @@ -60,7 +60,6 @@ Gist supports mapping GeoJSON files. These maps are displayed in embedded gists, Follow the steps below to create a gist. -{% ifversion fpt or ghes or ghae or ghec %} {% note %} You can also create a gist using the {% data variables.product.prodname_cli %}. For more information, see "[`gh gist create`](https://cli.github.com/manual/gh_gist_create)" in the {% data variables.product.prodname_cli %} documentation. @@ -68,7 +67,6 @@ You can also create a gist using the {% data variables.product.prodname_cli %}. Alternatively, you can drag and drop a text file from your desktop directly into the editor. {% endnote %} -{% endif %} 1. Sign in to {% data variables.product.product_name %}. 2. Navigate to your {% data variables.gists.gist_homepage %}. diff --git a/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md b/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md index 674196ec34..2b72abcd50 100644 --- a/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md +++ b/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md @@ -28,7 +28,6 @@ When you use two or more headings, GitHub automatically generates a table of con ![Screenshot highlighting the table of contents icon](/assets/images/help/repository/headings_toc.png) - ## Styling text You can indicate emphasis with bold, italic, or strikethrough text in comment fields and `.md` files. @@ -234,7 +233,7 @@ For more information, see "[About task lists](/articles/about-task-lists)." ## Mentioning people and teams -You can mention a person or [team](/articles/setting-up-teams/) on {% data variables.product.product_name %} by typing @ plus their username or team name. This will trigger a notification and bring their attention to the conversation. People will also receive a notification if you edit a comment to mention their username or team name. For more information about notifications, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}." +You can mention a person or [team](/articles/setting-up-teams/) on {% data variables.product.product_name %} by typing @ plus their username or team name. This will trigger a notification and bring their attention to the conversation. People will also receive a notification if you edit a comment to mention their username or team name. For more information about notifications, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)." {% note %} diff --git a/content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md b/content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md index 337d425e67..a6ea7be3a1 100644 --- a/content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md +++ b/content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md @@ -15,7 +15,7 @@ topics: ## Linking a pull request to an issue -To link a pull request to an issue to{% ifversion fpt or ghes or ghae or ghec %} show that a fix is in progress and to{% endif %} automatically close the issue when someone merges the pull request, type one of the following keywords followed by a reference to the issue. For example, `Closes #10` or `Fixes octo-org/octo-repo#100`. +To link a pull request to an issue to show that a fix is in progress and to automatically close the issue when someone merges the pull request, type one of the following keywords followed by a reference to the issue. For example, `Closes #10` or `Fixes octo-org/octo-repo#100`. * close * closes diff --git a/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/filtering-cards-on-a-project-board.md b/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/filtering-cards-on-a-project-board.md index 8ef74e1919..df592acef0 100644 --- a/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/filtering-cards-on-a-project-board.md +++ b/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/filtering-cards-on-a-project-board.md @@ -29,8 +29,8 @@ You can also use the "Filter cards" search bar at the top of each project board - Filter by check status using `status:pending`, `status:success`, or `status:failure` - Filter cards by type using `type:issue`, `type:pr`, or `type:note` - Filter cards by state and type using `is:open`, `is:closed`, or `is:merged`; and `is:issue`, `is:pr`, or `is:note` -- Filter cards by issues that are linked to a pull request by a closing reference using `linked:pr`{% ifversion fpt or ghes or ghae or ghec %} -- Filter cards by repository in an organization-wide project board using `repo:ORGANIZATION/REPOSITORY`{% endif %} +- Filter cards by issues that are linked to a pull request by a closing reference using `linked:pr` +- Filter cards by repository in an organization-wide project board using `repo:ORGANIZATION/REPOSITORY` 1. Navigate to the project board that contains the cards you want to filter. 2. Above the project card columns, click into the "Filter cards" search bar and type a search query to filter the cards. diff --git a/content/issues/tracking-your-work-with-issues/about-issues.md b/content/issues/tracking-your-work-with-issues/about-issues.md index a60eaf166a..7bd3da9292 100644 --- a/content/issues/tracking-your-work-with-issues/about-issues.md +++ b/content/issues/tracking-your-work-with-issues/about-issues.md @@ -21,7 +21,7 @@ topics: Issues let you track your work on {% data variables.product.company_short %}, where development happens. When you mention an issue in another issue or pull request, the issue's timeline reflects the cross-reference so that you can keep track of related work. To indicate that work is in progress, you can link an issue to a pull request. When the pull request merges, the linked issue automatically closes. -For more information on keywords, see "[Linking a pull request to an issue](issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)." +For more information on keywords, see "[Linking a pull request to an issue](/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)." ## Quickly create issues @@ -35,7 +35,7 @@ For more information about projects, see {% ifversion fpt or ghec %}"[About proj ## Stay up to date -To stay updated on the most recent comments in an issue, you can subscribe to an issue to receive notifications about the latest comments. To quickly find links to recently updated issues you're subscribed to, visit your dashboard. For more information, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}" and "[About your personal dashboard](/articles/about-your-personal-dashboard)." +To stay updated on the most recent comments in an issue, you can subscribe to an issue to receive notifications about the latest comments. To quickly find links to recently updated issues you're subscribed to, visit your dashboard. For more information, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)" and "[About your personal dashboard](/articles/about-your-personal-dashboard)." ## Community management diff --git a/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md b/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md index cf85394183..5c162949b5 100644 --- a/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md +++ b/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md @@ -178,11 +178,9 @@ With issue and pull request search terms, you can: {% endtip %} {% endif %} -{% ifversion fpt or ghes or ghae or ghec %} For issues, you can also use search to: - Filter for issues that are linked to a pull request by a closing reference: `linked:pr` -{% endif %} For pull requests, you can also use search to: - Filter [draft](/articles/about-pull-requests#draft-pull-requests) pull requests: `is:draft` @@ -193,8 +191,8 @@ For pull requests, you can also use search to: - Filter pull requests by [reviewer](/articles/about-pull-request-reviews/): `state:open type:pr reviewed-by:octocat` - Filter pull requests by the specific user [requested for review](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review): `state:open type:pr review-requested:octocat`{% ifversion fpt or ghae-issue-5181 or ghes > 3.2 or ghec %} - Filter pull requests that someone has asked you directly to review: `state:open type:pr user-review-requested:@me`{% endif %} -- Filter pull requests by the team requested for review: `state:open type:pr team-review-requested:github/atom`{% ifversion fpt or ghes or ghae or ghec %} -- Filter for pull requests that are linked to an issue that the pull request may close: `linked:issue`{% endif %} +- Filter pull requests by the team requested for review: `state:open type:pr team-review-requested:github/atom` +- Filter for pull requests that are linked to an issue that the pull request may close: `linked:issue` ## Sorting issues and pull requests @@ -217,7 +215,6 @@ You can sort any filtered view by: To clear your sort selection, click **Sort** > **Newest**. - ## Sharing filters When you filter or sort issues and pull requests, your browser's URL is automatically updated to match the new view. diff --git a/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md b/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md index 2f4e2d02b8..479c147c68 100644 --- a/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md +++ b/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md @@ -26,7 +26,7 @@ shortTitle: Link PR to issue ## About linked issues and pull requests -You can link an issue to a pull request {% ifversion fpt or ghes or ghae or ghec %}manually or {% endif %}using a supported keyword in the pull request description. +You can link an issue to a pull request manually or using a supported keyword in the pull request description. When you link a pull request to the issue the pull request addresses, collaborators can see that someone is working on the issue. @@ -56,11 +56,10 @@ Issue in the same repository | *KEYWORD* #*ISSUE-NUMBER* | `Closes #10` Issue in a different repository | *KEYWORD* *OWNER*/*REPOSITORY*#*ISSUE-NUMBER* | `Fixes octo-org/octo-repo#100` Multiple issues | Use full syntax for each issue | `Resolves #10, resolves #123, resolves octo-org/octo-repo#100` -{% ifversion fpt or ghes or ghae or ghec %}Only manually linked pull requests can be manually unlinked. To unlink an issue that you linked using a keyword, you must edit the pull request description to remove the keyword.{% endif %} +Only manually linked pull requests can be manually unlinked. To unlink an issue that you linked using a keyword, you must edit the pull request description to remove the keyword. You can also use closing keywords in a commit message. The issue will be closed when you merge the commit into the default branch, but the pull request that contains the commit will not be listed as a linked pull request. -{% ifversion fpt or ghes or ghae or ghec %} ## Manually linking a pull request to an issue Anyone with write permissions to a repository can manually link a pull request to an issue. @@ -78,7 +77,6 @@ You can manually link up to ten issues to each pull request. The issue and pull {% endif %} 5. Click the issue you want to link to the pull request. ![Drop down to link issue](/assets/images/help/pull_requests/link-issue-drop-down.png) -{% endif %} ## Further reading diff --git a/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md b/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md index 45ac72dd0d..50a36dcf69 100644 --- a/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md +++ b/content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md @@ -26,4 +26,4 @@ Your issues and pull request dashboards are available at the top of any page. On ## Further reading -- {% ifversion fpt or ghes or ghae or ghec %}"[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#reviewing-repositories-that-youre-watching){% else %}"[Listing the repositories you're watching](/github/receiving-notifications-about-activity-on-github/listing-the-repositories-youre-watching){% endif %}" +- "[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#reviewing-repositories-that-youre-watching)" diff --git a/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md index cb6bcf0755..b22365e690 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md @@ -35,7 +35,7 @@ In the left sidebar of your dashboard, you can access your organization's top re In the "All activity" section of your news feed, you can view updates from other teams and repositories in your organization. -The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)" and "[Following people](/articles/following-people)." For instance, the organization news feed shows updates when someone in the organization: - Creates a new branch. diff --git a/content/organizations/collaborating-with-your-team/about-team-discussions.md b/content/organizations/collaborating-with-your-team/about-team-discussions.md index 04845b1e72..aa01ec69db 100644 --- a/content/organizations/collaborating-with-your-team/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -32,7 +32,7 @@ When someone posts or replies to a public discussion on a team's page, members o {% tip %} -**Tip:** Depending on your notification settings, you'll receive updates by email, the web notifications page on {% data variables.product.product_name %}, or both. For more information, see {% ifversion fpt or ghae or ghes or ghec %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications)" and "[About web notifications](/github/receiving-notifications-about-activity-on-github/about-web-notifications){% endif %}." +**Tip:** Depending on your notification settings, you'll receive updates by email, the web notifications page on {% data variables.product.product_name %}, or both. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)." {% endtip %} @@ -40,7 +40,7 @@ By default, if your username is mentioned in a team discussion, you'll receive n To turn off notifications for team discussions, you can unsubscribe to a specific discussion post or change your notification settings to unwatch or completely ignore a specific team's discussions. You can subscribe to notifications for a specific discussion post even if you're unwatching that team's discussions. -For more information, see {% ifversion fpt or ghae or ghes or ghec %}"[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions){% else %}"[Subscribing to and unsubscribing from notifications](/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications){% endif %}" and "[Nested teams](/articles/about-teams/#nested-teams)." +For more information, see "[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions)" and "[Nested teams](/articles/about-teams/#nested-teams)." {% ifversion fpt or ghec %} diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index b672e7fc95..401665144c 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -61,8 +61,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`members_can_create_pages`](#members_can_create_pages-category-actions) | Contains all activities related to managing the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." | {% endif %} | [`org`](#org-category-actions) | Contains activities related to organization membership.{% ifversion ghec %} | [`org_credential_authorization`](#org_credential_authorization-category-actions) | Contains all activities related to authorizing credentials for use with SAML single sign-on.{% endif %}{% if secret-scanning-audit-log-custom-patterns %} -| [`org_secret_scanning_custom_pattern`](#org_secret_scanning_custom_pattern-category-actions) | Contains organization-level activities related to secret scanning custom patterns. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)." {% endif %}{% ifversion fpt or ghes or ghae or ghec %} -| [`organization_label`](#organization_label-category-actions) | Contains all activities related to default labels for repositories in your organization.{% endif %} +| [`org_secret_scanning_custom_pattern`](#org_secret_scanning_custom_pattern-category-actions) | Contains organization-level activities related to secret scanning custom patterns. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)." {% endif %} +| [`organization_label`](#organization_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} | [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} @@ -497,7 +497,6 @@ For more information, see "[Managing the publication of {% data variables.produc | `delete` | Triggered when a custom pattern is removed from secret scanning in an organization. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning#removing-a-custom-pattern)." {% endif %} -{% ifversion fpt or ghes or ghae or ghec %} ### `organization_label` category actions | Action | Description @@ -506,8 +505,6 @@ For more information, see "[Managing the publication of {% data variables.produc | `update` | Triggered when a default label is edited. | `destroy` | Triggered when a default label is deleted. -{% endif %} - ### `oauth_application` category actions | Action | Description @@ -572,11 +569,10 @@ For more information, see "[Managing the publication of {% data variables.produc | `update_required_status_checks_enforcement_level ` | Triggered when enforcement of required status checks is updated on a branch. | `update_strict_required_status_checks_policy` | Triggered when the requirement for a branch to be up to date before merging is changed. | `rejected_ref_update ` | Triggered when a branch update attempt is rejected. -| `policy_override ` | Triggered when a branch protection requirement is overridden by a repository administrator.{% ifversion fpt or ghes or ghae or ghec %} +| `policy_override ` | Triggered when a branch protection requirement is overridden by a repository administrator. | `update_allow_force_pushes_enforcement_level ` | Triggered when force pushes are enabled or disabled for a protected branch. | `update_allow_deletions_enforcement_level ` | Triggered when branch deletion is enabled or disabled for a protected branch. | `update_linear_history_requirement_enforcement_level ` | Triggered when required linear commit history is enabled or disabled for a protected branch. -{% endif %} {% ifversion fpt or ghes > 3.1 or ghae or ghec %} diff --git a/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md b/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md index d398fdffce..70ebd9df35 100644 --- a/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md +++ b/content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md @@ -31,11 +31,10 @@ People with the team maintainer role can manage team membership and settings. - [Delete team discussions](/articles/managing-disruptive-comments/#deleting-a-comment) - [Add organization members to the team](/articles/adding-organization-members-to-a-team) - [Remove organization members from the team](/articles/removing-organization-members-from-a-team) -- Remove the team's access to repositories{% ifversion fpt or ghes or ghae or ghec %} -- [Manage code review assignment for the team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team){% endif %}{% ifversion fpt or ghec %} +- Remove the team's access to repositories +- [Manage code review assignment for the team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team){% ifversion fpt or ghec %} - [Manage scheduled reminders for pull requests](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team){% endif %} - ## Promoting an organization member to team maintainer Before you can promote an organization member to team maintainer, the person must already be a member of the team. diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md index a260cbbe84..4f8797dc68 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md @@ -1,6 +1,6 @@ --- title: Changing the stage of a pull request -intro: 'You can mark a draft pull request as ready for review{% ifversion fpt or ghae or ghes or ghec %} or convert a pull request to a draft{% endif %}.' +intro: You can mark a draft pull request as ready for review or convert a pull request to a draft. permissions: People with write permissions to a repository and pull request authors can change the stage of a pull request. product: '{% data reusables.gated-features.draft-prs %}' redirect_from: @@ -21,21 +21,17 @@ shortTitle: Change the state {% data reusables.pull_requests.mark-ready-review %} -{% ifversion fpt or ghae or ghes or ghec %} {% tip %} **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. {% endtip %} -{% endif %} {% data reusables.repositories.sidebar-pr %} 2. In the "Pull requests" list, click the pull request you'd like to mark as ready for review. 3. In the merge box, click **Ready for review**. ![Ready for review button](/assets/images/help/pull_requests/ready-for-review-button.png) -{% ifversion fpt or ghae or ghes or ghec %} - ## Converting a pull request to a draft You can convert a pull request to a draft at any time. For example, if you accidentally opened a pull request instead of a draft, or if you've received feedback on your pull request that needs to be addressed, you can convert the pull request to a draft to indicate further changes are needed. No one can merge the pull request until you mark the pull request as ready for review again. People who are already subscribed to notifications for the pull request will not be unsubscribed when you convert the pull request to a draft. @@ -47,8 +43,6 @@ You can convert a pull request to a draft at any time. For example, if you accid 4. Click **Convert to draft**. ![Convert to draft confirmation](/assets/images/help/pull_requests/convert-to-draft-dialog.png) -{% endif %} - ## Further reading - "[About pull requests](/github/collaborating-with-issues-and-pull-requests/about-pull-requests)" diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md index 4ce18de40c..19b6706e34 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md @@ -21,7 +21,7 @@ Repositories belong to a personal account (a single individual owner) or an orga To assign a reviewer to a pull request, you will need write access to the repository. For more information about repository access, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." If you have write access, you can assign anyone who has read access to the repository as a reviewer. -Organization members with write access can also assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. {% ifversion fpt or ghae or ghes or ghec %}If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)."{% endif %} +Organization members with write access can also assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)." {% note %} diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md index 72a631d3b9..37fff36380 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md @@ -21,7 +21,7 @@ After a pull request is opened, anyone with *read* access can review and comment {% if pull-request-approval-limit %}{% data reusables.pull_requests.code-review-limits %}{% endif %} -Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)." {% ifversion fpt or ghae or ghes or ghec %}You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)."{% endif %} +Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)." You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)." Reviews allow for discussion of proposed changes and help ensure that the changes meet the repository's contributing guidelines and other quality standards. You can define which individuals or teams own certain types or areas of code in a CODEOWNERS file. When a pull request modifies code that has a defined owner, that individual or team will automatically be requested as a reviewer. For more information, see "[About code owners](/articles/about-code-owners/)." diff --git a/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md index 59d1f77e29..7d5654b4d3 100644 --- a/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md +++ b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md @@ -30,10 +30,10 @@ Here's an example of a [comparison between two branches](https://github.com/octo ## Comparing tags -Comparing release tags will show you changes to your repository since the last release. {% ifversion fpt or ghae or ghes or ghec %} -For more information, see "[Comparing releases](/github/administering-a-repository/comparing-releases)."{% endif %} +Comparing release tags will show you changes to your repository since the last release. +For more information, see "[Comparing releases](/github/administering-a-repository/comparing-releases)." -{% ifversion fpt or ghae or ghes or ghec %}To compare tags, you can select a tag name from the `compare` drop-down menu at the top of the page.{% else %} Instead of typing a branch name, type the name of your tag in the `compare` drop down menu.{% endif %} +To compare tags, you can select a tag name from the `compare` drop-down menu at the top of the page. Here's an example of a [comparison between two tags](https://github.com/octocat/linguist/compare/v2.2.0...octocat:v2.3.3). diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md index ce2d25bd63..6e4262001a 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md @@ -26,8 +26,7 @@ shortTitle: About merge methods {% data reusables.pull_requests.default_merge_option %} -{% ifversion fpt or ghae or ghes or ghec %} -The default merge method creates a merge commit. You can prevent anyone from pushing merge commits to a protected branch by enforcing a linear commit history. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-linear-history)."{% endif %} +The default merge method creates a merge commit. You can prevent anyone from pushing merge commits to a protected branch by enforcing a linear commit history. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-linear-history)." ## Squashing your merge commits diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md index c1cc5636b9..c3b91a9c2a 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md @@ -36,14 +36,11 @@ remote: error: Required status check "ci-build" is failing {% endnote %} -{% ifversion fpt or ghae or ghes or ghec %} - ## Conflicts between head commit and test merge commit Sometimes, the results of the status checks for the test merge commit and head commit will conflict. If the test merge commit has a status, the test merge commit must pass. Otherwise, the status of the head commit must pass before you can merge the branch. For more information about test merge commits, see "[Pulls](/rest/reference/pulls#get-a-pull-request)." ![Branch with conflicting merge commits](/assets/images/help/repository/req-status-check-conflicting-merge-commits.png) -{% endif %} ## Handling skipped but required checks diff --git a/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md b/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md index a8a463dce3..af0fdbf058 100644 --- a/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md +++ b/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md @@ -25,19 +25,17 @@ topics: {% endtip %} -{% ifversion fpt or ghae or ghes or ghec %} {% tip %} **Tip**: You can also create a repository using the {% data variables.product.prodname_cli %}. For more information, see "[`gh repo create`](https://cli.github.com/manual/gh_repo_create)" in the {% data variables.product.prodname_cli %} documentation. {% endtip %} -{% endif %} {% data reusables.repositories.create_new %} 2. Optionally, to create a repository with the directory structure and files of an existing repository, use the **Choose a template** drop-down and select a template repository. You'll see template repositories that are owned by you and organizations you're a member of or that you've used before. For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." - ![Template drop-down menu](/assets/images/help/repository/template-drop-down.png){% ifversion fpt or ghae or ghes or ghec %} + ![Template drop-down menu](/assets/images/help/repository/template-drop-down.png) 3. Optionally, if you chose to use a template, to include the directory structure and files from all branches in the template, and not just the default branch, select **Include all branches**. - ![Include all branches checkbox](/assets/images/help/repository/include-all-branches.png){% endif %} + ![Include all branches checkbox](/assets/images/help/repository/include-all-branches.png) 3. In the Owner drop-down, select the account you wish to create the repository on. ![Owner drop-down menu](/assets/images/help/repository/create-repository-owner.png) {% data reusables.repositories.repo-name %} diff --git a/content/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template.md b/content/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template.md index 280aa369a1..9bdef7e4d6 100644 --- a/content/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template.md +++ b/content/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template.md @@ -18,17 +18,13 @@ shortTitle: Create from a template Anyone with read permissions to a template repository can create a repository from that template. For more information, see "[Creating a template repository](/articles/creating-a-template-repository)." -{% ifversion fpt or ghae or ghes or ghec %} {% tip %} **Tip**: You can also create a repository from a template using the {% data variables.product.prodname_cli %}. For more information, see "[`gh repo create`](https://cli.github.com/manual/gh_repo_create)" in the {% data variables.product.prodname_cli %} documentation. {% endtip %} -{% endif %} -{% ifversion fpt or ghae or ghes or ghec %} You can choose to include the directory structure and files from only the default branch of the template repository or to include all branches. Branches created from a template have unrelated histories, which means you cannot create pull requests or merge between the branches. -{% endif %} Creating a repository from a template is similar to forking a repository, but there are important differences: - A new fork includes the entire commit history of the parent repository, while a repository created from a template starts with a single commit. @@ -44,8 +40,8 @@ For more information about forks, see "[About forks](/pull-requests/collaboratin ![Use this template button](/assets/images/help/repository/use-this-template-button.png) {% data reusables.repositories.owner-drop-down %} {% data reusables.repositories.repo-name %} -{% data reusables.repositories.choose-repo-visibility %}{% ifversion fpt or ghae or ghes or ghec %} +{% data reusables.repositories.choose-repo-visibility %} 6. Optionally, to include the directory structure and files from all branches in the template, and not just the default branch, select **Include all branches**. - ![Include all branches checkbox](/assets/images/help/repository/include-all-branches.png){% endif %} + ![Include all branches checkbox](/assets/images/help/repository/include-all-branches.png) {% data reusables.repositories.select-marketplace-apps %} 8. Click **Create repository from template**. diff --git a/content/repositories/creating-and-managing-repositories/creating-a-template-repository.md b/content/repositories/creating-and-managing-repositories/creating-a-template-repository.md index da56cb531b..c9281f3645 100644 --- a/content/repositories/creating-and-managing-repositories/creating-a-template-repository.md +++ b/content/repositories/creating-and-managing-repositories/creating-a-template-repository.md @@ -1,6 +1,6 @@ --- title: Creating a template repository -intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% ifversion fpt or ghae or ghes or ghec %}, branches,{% endif %} and files.' +intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure, branches, and files.' permissions: Anyone with admin permissions to a repository can make the repository a template. redirect_from: - /articles/creating-a-template-repository @@ -23,7 +23,7 @@ shortTitle: Create a template repo To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." -After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch.{% ifversion fpt or ghae or ghes or ghec %} They can also choose to include all the other branches in your repository. Branches created from a template have unrelated histories, so you cannot create pull requests or merge between the branches.{% endif %} For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." +After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch. They can also choose to include all the other branches in your repository. Branches created from a template have unrelated histories, so you cannot create pull requests or merge between the branches. For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/about-email-notifications-for-pushes-to-your-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/about-email-notifications-for-pushes-to-your-repository.md index 67c8fece20..dbb15fcae3 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/about-email-notifications-for-pushes-to-your-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/about-email-notifications-for-pushes-to-your-repository.md @@ -30,7 +30,7 @@ Each email notification for a push to a repository lists the new commits and lin - The files that were changed as part of the commit - The commit message -You can filter email notifications you receive for pushes to a repository. For more information, see {% ifversion fpt or ghae or ghes or ghec %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About notification emails](/github/receiving-notifications-about-activity-on-github/about-email-notifications)." You can also turn off email notifications for pushes. For more information, see "[Choosing the delivery method for your notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications){% endif %}." +You can filter email notifications you receive for pushes to a repository. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications)." ## Enabling email notifications for pushes to your repository @@ -45,10 +45,5 @@ You can filter email notifications you receive for pushes to a repository. For m ![Setup notifications button](/assets/images/help/settings/setup_notifications_settings.png) ## Further reading -{% ifversion fpt or ghae or ghes or ghec %} - "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)" -{% else %} -- "[About notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/about-notifications)" -- "[Choosing the delivery method for your notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)" -- "[About email notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/about-email-notifications)" -- "[About web notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/about-web-notifications)"{% endif %} + diff --git a/content/repositories/releasing-projects-on-github/about-releases.md b/content/repositories/releasing-projects-on-github/about-releases.md index 2ec8945120..816e90babf 100644 --- a/content/repositories/releasing-projects-on-github/about-releases.md +++ b/content/repositories/releasing-projects-on-github/about-releases.md @@ -31,7 +31,7 @@ Releases are deployable software iterations you can package and make available f Releases are based on [Git tags](https://git-scm.com/book/en/Git-Basics-Tagging), which mark a specific point in your repository's history. A tag date may be different than a release date since they can be created at different times. For more information about viewing your existing tags, see "[Viewing your repository's releases and tags](/github/administering-a-repository/viewing-your-repositorys-releases-and-tags)." -You can receive notifications when new releases are published in a repository without receiving notifications about other updates to the repository. For more information, see {% ifversion fpt or ghae or ghes or ghec %}"[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions){% else %}"[Watching and unwatching releases for a repository](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-releases-for-a-repository){% endif %}." +You can receive notifications when new releases are published in a repository without receiving notifications about other updates to the repository. For more information, see "[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions)." Anyone with read access to a repository can view and compare releases, but only people with write permissions to a repository can manage releases. For more information, see "[Managing releases in a repository](/github/administering-a-repository/managing-releases-in-a-repository)." diff --git a/content/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags.md b/content/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags.md index 393e6eb56c..630ebe1848 100644 --- a/content/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags.md +++ b/content/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags.md @@ -16,13 +16,11 @@ topics: - Repositories shortTitle: View releases & tags --- -{% ifversion fpt or ghae or ghes or ghec %} {% tip %} **Tip**: You can also view a release using the {% data variables.product.prodname_cli %}. For more information, see "[`gh release view`](https://cli.github.com/manual/gh_release_view)" in the {% data variables.product.prodname_cli %} documentation. {% endtip %} -{% endif %} ## Viewing releases diff --git a/content/rest/guides/getting-started-with-the-checks-api.md b/content/rest/guides/getting-started-with-the-checks-api.md index 11f50ee872..3ae85111e2 100644 --- a/content/rest/guides/getting-started-with-the-checks-api.md +++ b/content/rest/guides/getting-started-with-the-checks-api.md @@ -41,9 +41,7 @@ A check run is an individual test that is part of a check suite. Each run includ ![Check runs workflow](/assets/images/check_runs.png) -{% ifversion fpt or ghes or ghae or ghec %} If a check run is in a incomplete state for more than 14 days, then the check run's `conclusion` becomes `stale` and appears on {% data variables.product.prodname_dotcom %} as stale with {% octicon "issue-reopened" aria-label="The issue-reopened icon" %}. Only {% data variables.product.prodname_dotcom %} can mark check runs as `stale`. For more information about possible conclusions of a check run, see the [`conclusion` parameter](/rest/reference/checks#create-a-check-run--parameters). -{% endif %} As soon as you receive the [`check_suite`](/webhooks/event-payloads/#check_suite) webhook, you can create the check run, even if the check is not complete. You can update the `status` of the check run as it completes with the values `queued`, `in_progress`, or `completed`, and you can update the `output` as more details become available. A check run can contain timestamps, a link to more details on your external site, detailed annotations for specific lines of code, and information about the analysis performed. diff --git a/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md b/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md index b812221e4e..0174fae54a 100644 --- a/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md +++ b/content/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax.md @@ -86,7 +86,6 @@ If your search query contains whitespace, you will need to surround it with quot Some non-alphanumeric symbols, such as spaces, are dropped from code search queries within quotation marks, so results can be unexpected. -{% ifversion fpt or ghes or ghae or ghec %} ## Queries with usernames If your search query contains a qualifier that requires a username, such as `user`, `actor`, or `assignee`, you can use any {% data variables.product.product_name %} username, to specify a specific person, or `@me`, to specify the current user. @@ -97,4 +96,3 @@ Query | Example `QUALIFIER:@me` | [`is:issue assignee:@me`](https://github.com/search?q=is%3Aissue+assignee%3A%40me&type=Issues) matches issues assigned to the person viewing the results You can only use `@me` with a qualifier and not as search term, such as `@me main.workflow`. -{% endif %} diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md index dd17c6fc17..0ab2490764 100644 --- a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md +++ b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md @@ -54,15 +54,12 @@ To search issues and pull requests in all repositories owned by a certain user o {% data reusables.pull_requests.large-search-workaround %} - | Qualifier | Example | ------------- | ------------- | user:USERNAME | [**user:defunkt ubuntu**](https://github.com/search?q=user%3Adefunkt+ubuntu&type=Issues) matches issues with the word "ubuntu" from repositories owned by @defunkt. | org:ORGNAME | [**org:github**](https://github.com/search?q=org%3Agithub&type=Issues&utf8=%E2%9C%93) matches issues in repositories owned by the GitHub organization. | repo:USERNAME/REPOSITORY | [**repo:mozilla/shumway created:<2012-03-01**](https://github.com/search?q=repo%3Amozilla%2Fshumway+created%3A%3C2012-03-01&type=Issues) matches issues from @mozilla's shumway project that were created before March 2012. - - ## Search by open or closed state You can filter issues and pull requests based on whether they're open or closed using the `state` or `is` qualifier. @@ -136,7 +133,6 @@ You can use the `involves` qualifier to find issues that in some way involve a c | involves:USERNAME | **[involves:defunkt involves:jlord](https://github.com/search?q=involves%3Adefunkt+involves%3Ajlord&type=Issues)** matches issues either @defunkt or @jlord are involved in. | | [**NOT bootstrap in:body involves:mdo**](https://github.com/search?q=NOT+bootstrap+in%3Abody+involves%3Amdo&type=Issues) matches issues @mdo is involved in that do not contain the word "bootstrap" in the body. -{% ifversion fpt or ghes or ghae or ghec %} ## Search for linked issues and pull requests You can narrow your results to only include issues that are linked to a pull request by a closing reference, or pull requests that are linked to an issue that the pull request may close. @@ -145,7 +141,7 @@ You can narrow your results to only include issues that are linked to a pull req | `linked:pr` | [**repo:desktop/desktop is:open linked:pr**](https://github.com/search?q=repo%3Adesktop%2Fdesktop+is%3Aopen+linked%3Apr) matches open issues in the `desktop/desktop` repository that are linked to a pull request by a closing reference. | | `linked:issue` | [**repo:desktop/desktop is:closed linked:issue**](https://github.com/search?q=repo%3Adesktop%2Fdesktop+is%3Aclosed+linked%3Aissue) matches closed pull requests in the `desktop/desktop` repository that were linked to an issue that the pull request may have closed. | | `-linked:pr` | [**repo:desktop/desktop is:open -linked:pr**](https://github.com/search?q=repo%3Adesktop%2Fdesktop+is%3Aopen+-linked%3Apr) matches open issues in the `desktop/desktop` repository that are not linked to a pull request by a closing reference. | -| `-linked:issue` | [**repo:desktop/desktop is:open -linked:issue**](https://github.com/search?q=repo%3Adesktop%2Fdesktop+is%3Aopen+-linked%3Aissue) matches open pull requests in the `desktop/desktop` repository that are not linked to an issue that the pull request may close. |{% endif %} +| `-linked:issue` | [**repo:desktop/desktop is:open -linked:issue**](https://github.com/search?q=repo%3Adesktop%2Fdesktop+is%3Aopen+-linked%3Aissue) matches open pull requests in the `desktop/desktop` repository that are not linked to an issue that the pull request may close. | ## Search by label @@ -243,10 +239,9 @@ You can filter issues and pull requests by the number of reactions using the `re You can filter for draft pull requests. For more information, see "[About pull requests](/articles/about-pull-requests#draft-pull-requests)." | Qualifier | Example -| ------------- | -------------{% ifversion fpt or ghes or ghae or ghec %} +| ------------- | ------------- | `draft:true` | [**draft:true**](https://github.com/search?q=draft%3Atrue) matches draft pull requests. -| `draft:false` | [**draft:false**](https://github.com/search?q=draft%3Afalse) matches pull requests that are ready for review.{% else %} -| `is:draft` | [**is:draft**](https://github.com/search?q=is%3Adraft) matches draft pull requests.{% endif %} +| `draft:false` | [**draft:false**](https://github.com/search?q=draft%3Afalse) matches pull requests that are ready for review. ## Search by pull request review status and reviewer diff --git a/data/reusables/apps/deprecating_auth_with_query_parameters.md b/data/reusables/apps/deprecating_auth_with_query_parameters.md index 80a1833994..1c83fc9695 100644 --- a/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -1,4 +1,3 @@ -{% ifversion fpt or ghes or ghae or ghec %} {% warning %} **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue authentication to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens).{% ifversion fpt or ghec %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %} For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/). @@ -6,4 +5,3 @@ {% ifversion ghes or ghae %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} {% endwarning %} -{% endif %} diff --git a/data/reusables/cli/filter-issues-and-pull-requests-tip.md b/data/reusables/cli/filter-issues-and-pull-requests-tip.md index 98812b7152..cb30d4cea9 100644 --- a/data/reusables/cli/filter-issues-and-pull-requests-tip.md +++ b/data/reusables/cli/filter-issues-and-pull-requests-tip.md @@ -1,7 +1,5 @@ -{% ifversion fpt or ghes or ghae or ghec %} {% tip %} **Tip**: You can also filter issues or pull requests using the {% data variables.product.prodname_cli %}. For more information, see "[`gh issue list`](https://cli.github.com/manual/gh_issue_list)" or "[`gh pr list`](https://cli.github.com/manual/gh_pr_list)" in the {% data variables.product.prodname_cli %} documentation. {% endtip %} -{% endif %} diff --git a/data/reusables/organizations/team_maintainers_can.md b/data/reusables/organizations/team_maintainers_can.md index 7399688abc..45748e8eb2 100644 --- a/data/reusables/organizations/team_maintainers_can.md +++ b/data/reusables/organizations/team_maintainers_can.md @@ -10,6 +10,6 @@ Members with team maintainer permissions can: - [Add organization members to the team](/articles/adding-organization-members-to-a-team) - [Remove organization members from the team](/articles/removing-organization-members-from-a-team) - [Promote an existing team member to team maintainer](/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member) -- Remove the team's access to repositories{% ifversion fpt or ghes or ghae or ghec %} -- [Manage code review settings for the team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team){% endif %}{% ifversion fpt or ghec %} +- Remove the team's access to repositories +- [Manage code review settings for the team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team){% ifversion fpt or ghec %} - [Manage scheduled reminders for pull requests](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests){% endif %} diff --git a/data/reusables/pull_requests/close-issues-using-keywords.md b/data/reusables/pull_requests/close-issues-using-keywords.md index b6d3070db6..f7ed5cf566 100644 --- a/data/reusables/pull_requests/close-issues-using-keywords.md +++ b/data/reusables/pull_requests/close-issues-using-keywords.md @@ -1 +1 @@ -You can link a pull request to an issue to{% ifversion fpt or ghes or ghae or ghec %} show that a fix is in progress and to{% endif %} automatically close the issue when someone merges the pull request. For more information, see "[Linking a pull request to an issue](/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue)." +You can link a pull request to an issue to show that a fix is in progress and to automatically close the issue when someone merges the pull request. For more information, see "[Linking a pull request to an issue](/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue)." diff --git a/data/reusables/repositories/default-issue-templates.md b/data/reusables/repositories/default-issue-templates.md index e315eae12c..6dcea09ba6 100644 --- a/data/reusables/repositories/default-issue-templates.md +++ b/data/reusables/repositories/default-issue-templates.md @@ -1,2 +1 @@ -You can create default issue templates{% ifversion fpt or ghes or ghae or ghec %} and a default configuration file for issue templates{% endif %} for your organization{% ifversion fpt or ghes or ghae or ghec %} or personal account{% endif %}. For more information, see "[Creating a default community health file](/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file)." - +You can create default issue templates and a default configuration file for issue templates for your organization or personal account. For more information, see "[Creating a default community health file](/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file)." diff --git a/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md b/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md index eddee42d31..03f4a57505 100644 --- a/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md +++ b/data/reusables/repositories/squash-and-rebase-linear-commit-hisitory.md @@ -1 +1 @@ -{% ifversion fpt or ghes or ghae or ghec %}If there is a protected branch rule in your repository that requires a linear commit history, you must allow squash merging, rebase merging, or both. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-pull-request-reviews-before-merging)."{% endif %} +If there is a protected branch rule in your repository that requires a linear commit history, you must allow squash merging, rebase merging, or both. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-pull-request-reviews-before-merging)." diff --git a/data/reusables/repositories/start-line-comment.md b/data/reusables/repositories/start-line-comment.md index 1990d4f680..366c592780 100644 --- a/data/reusables/repositories/start-line-comment.md +++ b/data/reusables/repositories/start-line-comment.md @@ -1,2 +1,2 @@ -1. Hover over the line of code where you'd like to add a comment, and click the blue comment icon.{% ifversion fpt or ghes or ghae or ghec %} To add a comment on multiple lines, click and drag to select the range of lines, then click the blue comment icon.{% endif %} +1. Hover over the line of code where you'd like to add a comment, and click the blue comment icon. To add a comment on multiple lines, click and drag to select the range of lines, then click the blue comment icon. ![Blue comment icon](/assets/images/help/commits/hover-comment-icon.gif) diff --git a/data/reusables/repositories/suggest-changes.md b/data/reusables/repositories/suggest-changes.md index c9079f8ec0..00256f1309 100644 --- a/data/reusables/repositories/suggest-changes.md +++ b/data/reusables/repositories/suggest-changes.md @@ -1,2 +1,2 @@ -1. Optionally, to suggest a specific change to the line{% ifversion fpt or ghes or ghae or ghec %} or lines{% endif %}, click {% octicon "diff" aria-label="The diff symbol" %}, then edit the text within the suggestion block. +1. Optionally, to suggest a specific change to the line or lines, click {% octicon "diff" aria-label="The diff symbol" %}, then edit the text within the suggestion block. ![Suggestion block](/assets/images/help/pull_requests/suggestion-block.png) diff --git a/data/reusables/webhooks/check_run_properties.md b/data/reusables/webhooks/check_run_properties.md index b5ec1cacab..f20b5838af 100644 --- a/data/reusables/webhooks/check_run_properties.md +++ b/data/reusables/webhooks/check_run_properties.md @@ -3,7 +3,7 @@ Key | Type | Description `action`|`string` | The action performed. Can be one of: `check_run`|`object` | The [check_run](/rest/reference/checks#get-a-check-run). `check_run[status]`|`string` | The current status of the check run. Can be `queued`, `in_progress`, or `completed`. -`check_run[conclusion]`|`string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% ifversion fpt or ghes or ghae or ghec %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. +`check_run[conclusion]`|`string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, `action_required` or `stale`. This value will be `null` until the check run has `completed`. `check_run[name]`|`string` | The name of the check run. `check_run[check_suite][id]`|`integer` | The id of the check suite that this check run is part of. `check_run[check_suite][pull_requests]`|`array`| An array of pull requests that match this check suite. A pull request matches a check suite if they have the same `head_branch`.

**Note:** diff --git a/data/reusables/webhooks/check_suite_properties.md b/data/reusables/webhooks/check_suite_properties.md index 07ea1debcb..3f5487c324 100644 --- a/data/reusables/webhooks/check_suite_properties.md +++ b/data/reusables/webhooks/check_suite_properties.md @@ -5,6 +5,6 @@ Key | Type | Description `check_suite[head_branch]`|`string` | The head branch name the changes are on. `check_suite[head_sha]`|`string` | The SHA of the most recent commit for this check suite. `check_suite[status]`|`string` | The summary status for all check runs that are part of the check suite. Can be `requested`, `in_progress`, or `completed`. -`check_suite[conclusion]`|`string`| The summary conclusion for all check runs that are part of the check suite. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% ifversion fpt or ghes or ghae or ghec %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. +`check_suite[conclusion]`|`string`| The summary conclusion for all check runs that are part of the check suite. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, `action_required` or `stale`. This value will be `null` until the check run has `completed`. `check_suite[url]`|`string` | URL that points to the check suite API resource. `check_suite[pull_requests]`|`array`| An array of pull requests that match this check suite. A pull request matches a check suite if they have the same `head_branch`.

**Note:** diff --git a/data/reusables/webhooks/installation_properties.md b/data/reusables/webhooks/installation_properties.md index c2a6d203e6..e597666aea 100644 --- a/data/reusables/webhooks/installation_properties.md +++ b/data/reusables/webhooks/installation_properties.md @@ -1,4 +1,4 @@ Key | Type | Description ----|------|------------ -`action` | `string` | The action that was performed. Can be one of: +`action` | `string` | The action that was performed. Can be one of: `repositories` | `array` | An array of repository objects that the installation can access. diff --git a/script/helpers/get-liquid-conditionals.js b/script/helpers/get-liquid-conditionals.js index 44ec9899a3..9143f92058 100644 --- a/script/helpers/get-liquid-conditionals.js +++ b/script/helpers/get-liquid-conditionals.js @@ -72,7 +72,9 @@ function getLiquidConditionalsWithContent(str, tagName) { function groupTokens(tokens, tagName, endTagName, newArray = []) { const startIndex = tokens.findIndex((token) => token.conditional === tagName) // The end tag name is currently in a separate token, but we want to group it with the start tag and content. - const endIndex = tokens.findIndex((token) => token.conditional === endTagName) + const endIndex = tokens.findIndex( + (token, index) => token.conditional === endTagName && index > startIndex + ) // Once all tags are grouped and removed from `tokens`, this findIndex will not find anything, // so we can return the grouped result at this point. if (startIndex === -1) return newArray diff --git a/script/helpers/get-version-blocks.js b/script/helpers/get-version-blocks.js index 69f88d88df..1340868581 100644 --- a/script/helpers/get-version-blocks.js +++ b/script/helpers/get-version-blocks.js @@ -33,7 +33,7 @@ export default function getVersionBlocks(rawBlocks) { innerText = innerText.slice(0, indexOfLastEndif) // Remove any nested conditional content so we can check the top-level only. - const topLevelContent = innerText.replace(/{%-? ifversion[\S\s]+?{%-? endif -?%}/g, '') + const topLevelContent = innerText.replace(/{%-? ifversion[\S\s]+{%-? endif -?%}/g, '') versionBlocks.push({ condKeyword, diff --git a/script/helpers/remove-liquid-statements.js b/script/helpers/remove-liquid-statements.js index 21ec29d413..d7ec06b577 100644 --- a/script/helpers/remove-liquid-statements.js +++ b/script/helpers/remove-liquid-statements.js @@ -6,6 +6,8 @@ const supportedShortVersions = Object.values(allVersions).map((v) => v.shortName const updateRangeKeepGhes = 'updateRangeKeepGhes' const updateRangeRemoveGhes = 'updateRangeRemoveGhes' const removeRangeAndContent = 'removeRangeAndContent' +const removeConditionals = 'removeConditionals' + const tokenize = (str) => { const tokenizer = new Tokenizer(str) return tokenizer.readTopLevelTokens() @@ -33,6 +35,10 @@ export default function removeLiquidStatements(content, release, nextOldestRelea const isSafeToRemoveContent = versionBlock.isGhesOnly && (versionBlock.hasSingleRange || versionBlock.andGhesRanges.length) + if (isConditionalNecessary(supportedShortVersions, versionBlock.condArgs)) { + actionMap[removeConditionals] = true + } + for (const rangeArgs of versionBlock.ranges) { const rangeOperator = rangeArgs[1] const releaseNumber = rangeArgs[2] @@ -134,6 +140,7 @@ export default function removeLiquidStatements(content, release, nextOldestRelea } // ----- UPDATE RANGE AND KEEP `GHES` ----- + let containsAllSupportedVersions if (versionBlock.action.updateRangeKeepGhes) { const replacement = versionBlock.action.updateRangeKeepGhes.replace(/ghes.+$/, 'ghes') @@ -145,9 +152,9 @@ export default function removeLiquidStatements(content, release, nextOldestRelea // If the new conditional contains all the currently supported versions, no conditional // is actually needed, and it can be removed. Any `else` statements and their content should // also be removed. - const containsAllSupportedVersions = supportedShortVersions.every( - (v) => newCondWithLiquid.includes(v) && !newCondWithLiquid.includes('issue') - // The writers are using "issue" versions for upcoming GHAE releases + containsAllSupportedVersions = isConditionalNecessary( + supportedShortVersions, + newCondWithLiquid ) if (!containsAllSupportedVersions) { @@ -156,62 +163,66 @@ export default function removeLiquidStatements(content, release, nextOldestRelea newCondWithLiquid ) } + } - if (containsAllSupportedVersions) { - versionBlock.newContent = versionBlock.content + // ----- REMOVE CONDITIONALS ----- + // this happens if either: + // (a) the the conditional was updated in a previous step to contain all the currently supported versions, or + // (b) the conditional was not touched but its arguments already contained all supported versions, making it unnecessary + if (containsAllSupportedVersions || versionBlock.action.removeConditionals) { + versionBlock.newContent = versionBlock.content - // If this block does not contain else/elsifs, start by removing the final endif. - // (We'll handle the endif separately in those scenarios.) - if (!versionBlock.hasElse && !versionBlock.hasElsif) { - const indexOfLastEndif = lastIndexOfRegex(versionBlock.content, /{%-? endif -?%}/g) + // If this block does not contain else/elsifs, start by removing the final endif. + // (We'll handle the endif separately in those scenarios.) + if (!versionBlock.hasElse && !versionBlock.hasElsif) { + const indexOfLastEndif = lastIndexOfRegex(versionBlock.content, /{%-? endif -?%}/g) - versionBlock.newContent = versionBlock.newContent.slice(0, indexOfLastEndif) + versionBlock.newContent = versionBlock.newContent.slice(0, indexOfLastEndif) - if (versionBlock.endTagColumn1 && versionBlock.newContent.endsWith('\n')) - versionBlock.newContent = versionBlock.newContent.slice(0, -1) - } + if (versionBlock.endTagColumn1 && versionBlock.newContent.endsWith('\n')) + versionBlock.newContent = versionBlock.newContent.slice(0, -1) + } - // If start tag is on it's own line, remove line ending (\\n?) - // and remove white space (//s*) after line ending to - // preserve indentation of next line - const removeStartTagRegex = versionBlock.startTagColumn1 - ? new RegExp(`${versionBlock.condWithLiquid}\\n?\\s*`) - : new RegExp(`${versionBlock.condWithLiquid}`) + // If start tag is on it's own line, remove line ending (\\n?) + // and remove white space (//s*) after line ending to + // preserve indentation of next line + const removeStartTagRegex = versionBlock.startTagColumn1 + ? new RegExp(`${versionBlock.condWithLiquid}\\n?\\s*`) + : new RegExp(`${versionBlock.condWithLiquid}`) - // For ALL scenarios, remove the start tag. - versionBlock.newContent = versionBlock.newContent.replace(removeStartTagRegex, '') + // For ALL scenarios, remove the start tag. + versionBlock.newContent = versionBlock.newContent.replace(removeStartTagRegex, '') - // If the block has an elsif, change the elsif to an if (or leave it an elsif this this block is itself an elsif), - // leaving the content inside the elsif block as is. Also leave the endif in this scenario. - if (versionBlock.hasElsif) { - versionBlock.newContent = versionBlock.newContent.replace( - /({%-) elsif/, - `$1 ${versionBlock.condKeyword}` - ) - } + // If the block has an elsif, change the elsif to an if (or leave it an elsif this this block is itself an elsif), + // leaving the content inside the elsif block as is. Also leave the endif in this scenario. + if (versionBlock.hasElsif) { + versionBlock.newContent = versionBlock.newContent.replace( + /({%-) elsif/, + `$1 ${versionBlock.condKeyword}` + ) + } - // If the block has an else, remove the else, its content, and the endif. - if (versionBlock.hasElse) { - let elseStartIndex - let ifCondFlag = false - // tokenize the content including the nested conditionals to find - // the unmatched else tag. Remove content from the start of the - // else tag to the end of the content. The tokens return have different - // `kind`s and can be liquid tags, HTML, and a variety of things. - // A value of 4 is a liquid tag. See https://liquidjs.com/api/enums/parser_token_kind_.tokenkind.html. - tokenize(versionBlock.newContent) - .filter((elem) => elem.kind === 4) - .forEach((tag) => { - if (tag.name === 'ifversion' || tag.name === 'if') { - ifCondFlag = true - } else if (tag.name === 'endif' && ifCondFlag === true) { - ifCondFlag = false - } else if (tag.name === 'else' && ifCondFlag === false) { - elseStartIndex = tag.begin - } - }) - versionBlock.newContent = versionBlock.newContent.slice(0, elseStartIndex) - } + // If the block has an else, remove the else, its content, and the endif. + if (versionBlock.hasElse) { + let elseStartIndex + let ifCondFlag = false + // tokenize the content including the nested conditionals to find + // the unmatched else tag. Remove content from the start of the + // else tag to the end of the content. The tokens return have different + // `kind`s and can be liquid tags, HTML, and a variety of things. + // A value of 4 is a liquid tag. See https://liquidjs.com/api/enums/parser_token_kind_.tokenkind.html. + tokenize(versionBlock.newContent) + .filter((elem) => elem.kind === 4) + .forEach((tag) => { + if (tag.name === 'ifversion' || tag.name === 'if') { + ifCondFlag = true + } else if (tag.name === 'endif' && ifCondFlag === true) { + ifCondFlag = false + } else if (tag.name === 'else' && ifCondFlag === false) { + elseStartIndex = tag.begin + } + }) + versionBlock.newContent = versionBlock.newContent.slice(0, elseStartIndex) } } }) @@ -244,3 +255,14 @@ function lastIndexOfRegex(str, regex, fromIndex) { return match ? myStr.lastIndexOf(match[match.length - 1]) : -1 } + +// Checks if a conditional is necessary given all the supported versions and the arguments in a conditional +// If all supported versions show up in the arguments, it's not necessary! Additionally, builds in support +// for when feature-based versioning is used, which looks like "issue" versions for upcoming GHAE releases +function isConditionalNecessary(supportedVersions, conditionalArguments) { + return supportedVersions.every( + (arg) => + (conditionalArguments.includes(arg) || conditionalArguments.includes('or ' + arg)) && + !conditionalArguments.includes('issue') + ) +} diff --git a/tests/content/remove-liquid-statements.js b/tests/content/remove-liquid-statements.js index 2c65fca324..cdd0cc9894 100644 --- a/tests/content/remove-liquid-statements.js +++ b/tests/content/remove-liquid-statements.js @@ -14,6 +14,7 @@ const nextOldestVersion = '2.14' // Remove liquid only const greaterThan = path.join(removeLiquidStatementsFixtures, 'greater-than.md') +const unnecessary = path.join(removeLiquidStatementsFixtures, 'unnecessary.md') const andGreaterThan1 = path.join(removeLiquidStatementsFixtures, 'and-greater-than1.md') const andGreaterThan2 = path.join(removeLiquidStatementsFixtures, 'and-greater-than2.md') const notEquals = path.join(removeLiquidStatementsFixtures, 'not-equals.md') @@ -63,6 +64,24 @@ Alpha\n\n{% else %}\n\nBravo\n\n{% ifversion ghes > 2.16 %}\n\nCharlie\n expect($('.example10').text().trim()).toBe(`{% ifversion ghes %}\n\nAlpha\n {% else %}\n\nBravo\n\n{% endif %}`) }) + test('removes liquid statements that specify all known versions, including some nested conditionals"', async () => { + let contents = await readFileAsync(unnecessary, 'utf8') + contents = removeLiquidStatements(contents, versionToDeprecate, nextOldestVersion) + const $ = cheerio.load(contents) + expect($('.example1').text().trim()).toBe(`Alpha`) + expect($('.example2').text().trim()).toBe( + `Alpha\n {% ifversion fpt or ghec %}\n Bravo\n {% endif %}` + ) + expect($('.example3').text().trim()).toBe( + `Alpha\n {% ifversion fpt or ghec %}\n Bravo\n {% else %}\n Delta\n {% endif %}` + ) + expect($('.example4').text().trim()).toBe( + `Alpha\n {% ifversion fpt or ghec %}\n Bravo\n {% ifversion ghae %}\n Charlie\n {% endif %}\n {% endif %}` + ) + expect($('.example5').text().trim()).toBe( + `Alpha\n {% ifversion fpt or ghec %}\n Bravo\n {% ifversion ghae %}\n Charlie\n {% endif %}\n {% else %}\n Delta\n {% endif %}` + ) + }) test('removes liquid statements that specify "and greater than version to deprecate"', async () => { let contents = await readFileAsync(andGreaterThan1, 'utf8') diff --git a/tests/fixtures/remove-liquid-statements/unnecessary.md b/tests/fixtures/remove-liquid-statements/unnecessary.md new file mode 100644 index 0000000000..fa529ecf1a --- /dev/null +++ b/tests/fixtures/remove-liquid-statements/unnecessary.md @@ -0,0 +1,72 @@ +--- +title: Remove unnecessary conditionals including nested +intro: Remove liquid only +--- + +## 1 +
+ +{% ifversion fpt or ghes or ghae or ghec %} +Alpha +{% endif %} + +
+ +## 2 +
+ +{% ifversion fpt or ghes or ghae or ghec %} +Alpha + {% ifversion fpt or ghec %} + Bravo + {% endif %} +{% endif %} + +
+ +## 3 +
+ +{% ifversion fpt or ghes or ghae or ghec %} +Alpha + {% ifversion fpt or ghec %} + Bravo + {% else %} + Delta + {% endif %} +{% endif %} + +
+ +## 4 +
+ +{% ifversion fpt or ghes or ghae or ghec %} +Alpha + {% ifversion fpt or ghec %} + Bravo + {% ifversion ghae %} + Charlie + {% endif %} + {% endif %} +{% endif %} + +
+ +## 5 +
+ +{% ifversion fpt or ghes or ghae or ghec %} +Alpha + {% ifversion fpt or ghec %} + Bravo + {% ifversion ghae %} + Charlie + {% endif %} + {% else %} + Delta + {% endif %} +{% endif %} + +
+