From 857620314a5a2d6ffa1d0c807ad4de5548c990d1 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:26:16 +0000 Subject: [PATCH 1/5] Hack week 2025: remove unneeded FBV instances (20) - Projects (#54012) --- .../archiving-items-automatically.md | 10 ++++---- .../using-the-api-to-manage-projects.md | 24 ++++++++----------- .../copying-an-existing-project.md | 10 ++++---- .../creating-projects/creating-a-project.md | 6 +---- .../customizing-the-board-layout.md | 15 ------------ .../customizing-the-roadmap-layout.md | 22 ----------------- .../customizing-the-table-layout.md | 11 --------- .../learning-about-projects/about-projects.md | 2 +- .../adding-items-to-your-project.md | 8 ------- .../editing-items-in-your-project.md | 4 +++- .../managing-access-to-your-projects.md | 8 ------- ...-project-templates-in-your-organization.md | 4 +++- .../about-single-select-fields.md | 14 +---------- .../using-issues/creating-an-issue.md | 4 ---- .../managing-base-permissions-for-projects.md | 4 +++- data/reusables/projects/about-board-layout.md | 2 +- .../projects/about-roadmap-layout.md | 4 ++-- data/reusables/projects/create-project.md | 2 +- .../reusables/projects/create-user-project.md | 2 +- 19 files changed, 37 insertions(+), 119 deletions(-) diff --git a/content/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically.md b/content/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically.md index b5d87937112a..c56bd5d569eb 100644 --- a/content/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically.md +++ b/content/issues/planning-and-tracking-with-projects/automating-your-project/archiving-items-automatically.md @@ -40,15 +40,13 @@ Projects also have a limit on the number of archived items they can contain. You ## Configuring automatic archiving in your project {% data reusables.projects.access-workflows %} -1. In the "Default workflows" list, click **Auto-archive items**.{% ifversion projects-v2-workflows-ui-refresh %} +1. In the "Default workflows" list, click **Auto-archive items**. 1. In the top right, click **Edit**. ![Screenshot showing a project's menu bar. The "Edit" button is highlighted with an orange rectangle.](/assets/images/help/projects-v2/workflow-start-editing.png) - {% else %} -1. Next to **When**, check the item type(s) that you want to automatically archive.{% endif %} -1. In the "Filters" field, type the filter criteria you want to use to automatically archive items. You can only use the `is`, `reason`, and `updated` filters.{% ifversion projects-v2-workflows-ui-refresh %} -1. To save your changes and enable the workflow, click **Save and turn on workflow**.{% else %} -1. If the workflow is disabled, click the toggle next to **Off** to enable the workflow.{% endif %} + +1. In the "Filters" field, type the filter criteria you want to use to automatically archive items. You can only use the `is`, `reason`, and `updated` filters. +1. To save your changes and enable the workflow, click **Save and turn on workflow**. ## Further reading diff --git a/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md b/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md index 47b9abedefe6..75b5674135db 100644 --- a/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md +++ b/content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md @@ -395,7 +395,7 @@ gh api graphql -f query=' nodes{ id fieldValues(first: 8) { - nodes{ + nodes{ ... on ProjectV2ItemFieldTextValue { text field { @@ -420,9 +420,9 @@ gh api graphql -f query=' } } } - } + } } - content{ + content{ ... on DraftIssue { title body @@ -574,7 +574,7 @@ gh api graphql -f query=' mutation { updateProjectV2( input: { - projectId: "PROJECT_ID", + projectId: "PROJECT_ID", title: "Project title", public: false, readme: "# Project README\n\nA long description", @@ -618,8 +618,8 @@ gh api graphql -f query=' projectId: "PROJECT_ID" itemId: "ITEM_ID" fieldId: "FIELD_ID" - value: { - text: "Updated text" + value: { + text: "Updated text" } } ) { @@ -673,8 +673,8 @@ gh api graphql -f query=' projectId: "PROJECT_ID" itemId: "ITEM_ID" fieldId: "FIELD_ID" - value: { - singleSelectOptionId: "OPTION_ID" + value: { + singleSelectOptionId: "OPTION_ID" } } ) { @@ -717,8 +717,8 @@ gh api graphql -f query=' projectId: "PROJECT_ID" itemId: "ITEM_ID" fieldId: "FIELD_ID" - value: { - iterationId: "ITERATION_ID" + value: { + iterationId: "ITERATION_ID" } } ) { @@ -826,10 +826,6 @@ gh api graphql -f query=' {% endcli %} -{% ifversion projects-v2-webhooks %} - ## Using webhooks You can use webhooks to subscribe to events taking place in your project. For example, when an item is edited, {% data variables.product.product_name %} can send a HTTP POST payload to the webhook's configured URL which can trigger automation on your server. For more information about webhooks, see [AUTOTITLE](/webhooks-and-events/webhooks/about-webhooks). To learn more about the `projects_v2_item` webhook event, see [AUTOTITLE](/webhooks-and-events/webhooks/webhook-events-and-payloads#projects_v2_item). - -{% endif %} diff --git a/content/issues/planning-and-tracking-with-projects/creating-projects/copying-an-existing-project.md b/content/issues/planning-and-tracking-with-projects/creating-projects/copying-an-existing-project.md index 25999144f352..8b78669a8d8b 100644 --- a/content/issues/planning-and-tracking-with-projects/creating-projects/copying-an-existing-project.md +++ b/content/issues/planning-and-tracking-with-projects/creating-projects/copying-an-existing-project.md @@ -3,7 +3,9 @@ title: 'Copying an existing {% data variables.projects.project_v2 %}' shortTitle: Copying a project intro: You can use an existing project as a template by copying it. versions: - feature: projects-v2-copy-a-project + fpt: '*' + ghes: '*' + ghec: '*' type: tutorial topics: - Projects @@ -16,7 +18,7 @@ You can copy an existing project and use it as a template to save time configuri When you copy a project, the new project will contain the same {% data reusables.projects.what-gets-copied %}. {% ifversion projects-v2-org-templates-improvements %}The new project will not contain the original project's items, collaborators, or team and repository links.{% else %}The new project will not contain the original project's items, workflows, insights, collaborators, or team and repository links.{% endif %} -{% ifversion projects-v2-org-templates %}{% data reusables.projects.org-templates %}{% endif %} +{% data reusables.projects.org-templates %} ## Copying an existing project @@ -27,9 +29,9 @@ When you copy a project, the new project will contain the same {% data reusables 1. In the menu, click **{% octicon "copy" aria-hidden="true" %} Make a copy**. 1. Optionally, if you want all draft issues to be copied with the project, in the "Make a copy" dialog, select **Draft issues will be copied if selected**.{%- ifversion projects-v2-org-templates-improvements %}{%- else %} - + ![Screenshot showing the "Make a copy" form.](/assets/images/help/projects-v2/copy-project-form.png) - + {%- endif %} 1. Under "Owner", select either the organization that will own the new project or your personal account. 1. Under "New project name", type the name of the new project. diff --git a/content/issues/planning-and-tracking-with-projects/creating-projects/creating-a-project.md b/content/issues/planning-and-tracking-with-projects/creating-projects/creating-a-project.md index 96a733561a12..0ad49b966bee 100644 --- a/content/issues/planning-and-tracking-with-projects/creating-projects/creating-a-project.md +++ b/content/issues/planning-and-tracking-with-projects/creating-projects/creating-a-project.md @@ -13,17 +13,13 @@ allowTitleToDifferFromFilename: true {% data variables.product.prodname_projects_v2 %} are an adaptable collection of items that stay up-to-date with {% data variables.product.company_short %} data. Your projects can track issues, pull requests, and ideas that you note down. You can add custom fields and create views for specific purposes. -{% ifversion projects-v2-copy-a-project %} - You can also choose to use an existing project as a template and copy the views and custom fields to a new project. For more information, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/creating-projects/copying-an-existing-project). -{% endif %} - ## Creating a project ### Creating an organization project -Organization projects can track issues and pull requests from the organization's repositories. {% ifversion projects-v2-org-templates %}{% data reusables.projects.org-templates %}{% endif %} +Organization projects can track issues and pull requests from the organization's repositories. {% data reusables.projects.org-templates %} {% data reusables.projects.create-project %} diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md index 60e3363c3c3f..718aa7f6e15e 100644 --- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md +++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md @@ -15,8 +15,6 @@ topics: For more information about changing a view to use the board layout, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view#changing-the-project-layout). -{% ifversion projects-v2-column-limits %} - ## Setting a limit on the number of items in a column You can set a limit for the number of cards in a particular column in a board layout. Setting a limit does not restrict anyone from adding cards that would exceed the column's limit, nor does it restrict any automations from adding cards. Column limits are unique to each view in your project. @@ -30,8 +28,6 @@ The current count of cards and the column's limit is displayed at the top of the 1. Optionally, to remove the limit, clear the entry. 1. Click **Save**. -{% endif %} - ## Showing and hiding fields {% data reusables.projects.customize.show-hide-field %} @@ -44,8 +40,6 @@ In the board layout, you choose any single select or iteration field for your co 1. Click **{% octicon "columns" aria-hidden="true" %} Column field**. 1. Click the field you want to use. -{% ifversion projects-v2-column-visibility %} - ## Showing and hiding columns in board layout In the board layout, you can choose which columns to display. The available columns are made up of the contents of your selected column field. @@ -55,7 +49,6 @@ In the board layout, you can choose which columns to display. The available colu ![Screenshot of a board layout scrolled to the very right. The "Add a new column to the board" button is highlighted with an orange outline.](/assets/images/help/projects-v2/board-add-column.png) 1. Select the columns you want to show. -{% endif %} {% ifversion projects-v2-slice-panel %} @@ -65,8 +58,6 @@ In the board layout, you can choose which columns to display. The available colu {% endif %} -{% ifversion projects-v2-consistent-sorting %} - ## Sorting by field values You can sort items by a field value. @@ -76,8 +67,6 @@ You can sort items by a field value. {% data reusables.projects.customize.sort %} -{% endif %} - {% ifversion projects-v2-swimlanes %} ## Grouping by field values @@ -90,10 +79,6 @@ You can use a custom field value to group items and create horizontal sections o {% endif %} -{% ifversion projects-v2-numeric-summary %} - ## Showing the sum of a number field {% data reusables.projects.customize.sum %} - -{% endif %} diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout.md index 23f99cf8a6ef..64ce5d7897c6 100644 --- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout.md +++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout.md @@ -28,8 +28,6 @@ You can set the date or iteration fields that your roadmap will use to position 1. Optionally, to create a new date or iteration field, click **{% octicon "plus" aria-hidden="true" %} New field**, type the name of your field, and click **Save**. You can then select the new field or create another. 1. Select a date or iteration field for "Start date" and "Target date." -{% ifversion projects-v2-roadmap-markers %} - ## Setting vertical markers You can configure vertical markers on a roadmap to show your iterations, the dates of items in your project, and the milestones associated with items in your project. @@ -40,8 +38,6 @@ You can configure vertical markers on a roadmap to show your iterations, the dat 1. In the menu, select which markers you want to display on your roadmap. -{% endif %} - ## Setting the zoom level You can choose the density of items on your roadmap. You can zoom in to show one month at a time or, for a greater overview, you can zoom out to show a quarter of a year or a full year. @@ -60,36 +56,18 @@ You can choose the density of items on your roadmap. You can zoom in to show one {% endif %} -{% ifversion projects-v2-consistent-sorting %} - ## Sorting by field values You can sort items by a field value. {% data reusables.projects.customize.sort %} -{% endif %} - -{% ifversion projects-v2-roadmap-markers %}{% else %} - -## Showing and hiding fields - -When you show and hide fields on the roadmap layout, you define which fields are shown when the side panel opens. This setting will not affect the information visible on the roadmap layout. - -{% data reusables.projects.customize.show-hide-field %} - -{% endif %} - ## Grouping by field values You can group items by a custom field value. {% data reusables.projects.customize.group-fields %} -{% ifversion projects-v2-numeric-summary %} - ## Showing the sum of a number field {% data reusables.projects.customize.sum %} - -{% endif %} diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md index 08212be107ec..6f3a53ddd489 100644 --- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md +++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md @@ -65,19 +65,8 @@ You can change the order of rows. You can sort items by a field value. -{% ifversion projects-v2-consistent-sorting %}{% else %} - -> [!NOTE] -> When a table is sorted, you cannot manually reorder rows. - -{% endif %} - {% data reusables.projects.customize.sort %} -{% ifversion projects-v2-numeric-summary %} - ## Showing the sum of a number field {% data reusables.projects.customize.sum %} - -{% endif %} diff --git a/content/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects.md b/content/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects.md index fd6b915b16cc..da2c4b4da522 100644 --- a/content/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects.md +++ b/content/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects.md @@ -21,7 +21,7 @@ To get started and create a project, see [AUTOTITLE](/issues/planning-and-tracki Your projects are built from the issues and pull requests you add, creating direct references between your project and your work. Information is synced automatically to your project as you make changes, updating your views and charts. This integration works both ways, so that when you change information about a pull request or issue in your project, the pull request or issue reflects that information. For example, change an assignee in your project and that change is shown in your issue. You can take this integration even further, group your project by assignee, and make changes to issue assignment by dragging issues into the different groups. -To learn more about managing items in your project, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project){% ifversion projects-v2-bulk-table-editing %} and [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project){% endif %}. +To learn more about managing items in your project, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project) and [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project). ### Adding metadata to your items diff --git a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md index 2a42e8d71f71..0e2df7319087 100644 --- a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md +++ b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md @@ -26,12 +26,8 @@ When you add an issue or pull request to your project, an event will be added to {% endif %} -{% ifversion projects-v2-bulk-table-editing %} - For more information about making bulk changes to your items after adding them, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project). -{% endif %} - ### Automatically adding issues and pull requests You can configure a built-in workflow to automatically add issues and pull requests from a repository when they meet specific filter criteria. For more information about configuring a workflow, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/automating-your-project/adding-items-automatically). @@ -95,16 +91,12 @@ You can use the command palette when viewing your project to quickly add items. 1. Start typing "Add items" and press Return. {% data reusables.projects.bulk-add %} -{% ifversion projects-v2-create-issue-modal %} - ## Creating issues {% data reusables.projects.about-issue-modal %} {% data reusables.projects.create-issue-modal %} -{% endif %} - ## Creating draft issues Draft issues are useful to quickly capture ideas. Unlike issues and pull requests that are referenced from your repositories, draft issues exist only in your project. diff --git a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project.md b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project.md index 25fb6630ba6c..380ae82d603f 100644 --- a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project.md +++ b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/editing-items-in-your-project.md @@ -3,7 +3,9 @@ title: 'Editing items in your {% data variables.projects.project_v2 %}' shortTitle: Editing items intro: 'There are several methods you can use within your {% data variables.projects.project_v2 %} to quickly make changes to multiple items.' versions: - feature: projects-v2-bulk-table-editing + fpt: '*' + ghes: '*' + ghec: '*' type: tutorial topics: - Projects diff --git a/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-access-to-your-projects.md b/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-access-to-your-projects.md index d9142876a023..7f6280b99411 100644 --- a/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-access-to-your-projects.md +++ b/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-access-to-your-projects.md @@ -27,18 +27,10 @@ You can control access to your project by setting permissions for particular ind ### Managing access for everyone in your organization -{% ifversion projects-v2-default-base-permission %} - You can manage access for everyone in your organization to a particular project by changing the project's base permission. Changes to the base permission only affect organization members who are not organization owners and who are not granted individual access. You can also configure the default base permission at the organization-level for new projects and projects that haven't yet had a base permission configured. For more information about setting your organization's base permission for projects, see [AUTOTITLE](/organizations/managing-organization-settings/managing-base-permissions-for-projects). -{% else %} - -The default base role is `write`, meaning that everyone in the organization can see and edit your project. To change project access for everyone in the organization, you can change the base role. Changes to the base role only affect organization members who are not organization owners and who are not granted individual access. - -{% endif %} - {% data reusables.projects.project-settings %} 1. Click **Manage access**. 1. Under **Base role**, select the default role. diff --git a/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-project-templates-in-your-organization.md b/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-project-templates-in-your-organization.md index 2c4d4a4d7d4e..9168fa0114df 100644 --- a/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-project-templates-in-your-organization.md +++ b/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-project-templates-in-your-organization.md @@ -3,7 +3,9 @@ title: 'Managing {% data variables.projects.project_v2 %} templates in your orga shortTitle: 'Managing templates' intro: 'You can {% ifversion projects-v2-org-templates-improvements %}create templates or {% endif %}set projects as templates in your organization, allowing other people to select your template as the base for projects they create.' versions: - feature: projects-v2-org-templates + fpt: '*' + ghes: '*' + ghec: '*' type: tutorial permissions: 'People with admin permissions for a project in an organization can set the project as a template. People with admin or write permissions for a project in an organization can copy the project and set the copied project as a template.' topics: diff --git a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-single-select-fields.md b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-single-select-fields.md index b0576b039fa3..1201789fe132 100644 --- a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-single-select-fields.md +++ b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-single-select-fields.md @@ -1,7 +1,7 @@ --- title: About single select fields shortTitle: About single select fields -intro: 'You can create single select fields with multiple options{% ifversion projects-v2-colorful-selects %}, each with a description and a color,{% endif %} that can be selected from a dropdown menu.' +intro: 'You can create single select fields with multiple options, each with a description and a color, that can be selected from a dropdown menu.' versions: feature: projects-v2 type: tutorial @@ -25,8 +25,6 @@ Single select fields can contain up to 50 options. ## Editing a single select field -{% ifversion projects-v2-colorful-selects %} - You can set descriptions and colors for each of your single select options. 1. Access your project's settings. @@ -41,13 +39,3 @@ You can set descriptions and colors for each of your single select options. 1. Optionally, under **Description**, type a description for this option. 1. Click **Save** to save your changes. - -{% else %} - -{% data reusables.projects.project-settings %} -1. Click the name of the single select field you want to adjust. -1. Edit existing options or click **Add option**. -1. Optionally, to delete an option, click {% octicon "x" aria-label="Remove option" %}. -1. Click **Save options**. - -{% endif %} diff --git a/content/issues/tracking-your-work-with-issues/using-issues/creating-an-issue.md b/content/issues/tracking-your-work-with-issues/using-issues/creating-an-issue.md index 467fcf37ba89..19f93e5c911f 100644 --- a/content/issues/tracking-your-work-with-issues/using-issues/creating-an-issue.md +++ b/content/issues/tracking-your-work-with-issues/using-issues/creating-an-issue.md @@ -113,8 +113,6 @@ When you create an issue from a discussion, the contents of the discussion post {% data reusables.repositories.assign-an-issue-as-project-maintainer %} {% data reusables.repositories.submit-new-issue %} -{% ifversion projects-v2-create-issue-modal %} - ## Creating an issue from a project {% data reusables.projects.about-issue-modal %} For more information about Projects, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects). @@ -122,8 +120,6 @@ When you create an issue from a discussion, the contents of the discussion post 1. Navigate to your project. {% data reusables.projects.create-issue-modal %} -{% endif %} - {% ifversion projects-v1 %} ## Creating an issue from a {% data variables.projects.projects_v1_board %} note diff --git a/content/organizations/managing-organization-settings/managing-base-permissions-for-projects.md b/content/organizations/managing-organization-settings/managing-base-permissions-for-projects.md index 40c74d84b6df..10549208396b 100644 --- a/content/organizations/managing-organization-settings/managing-base-permissions-for-projects.md +++ b/content/organizations/managing-organization-settings/managing-base-permissions-for-projects.md @@ -2,7 +2,9 @@ title: 'Managing base permissions for {% data variables.projects.projects_v2 %}' intro: 'Organization owners can configure a base permission for {% data variables.projects.projects_v2 %} created in their organization.' versions: - feature: projects-v2-default-base-permission + fpt: '*' + ghes: '*' + ghec: '*' topics: - Projects shortTitle: 'Manage {% data variables.projects.projects_v2 %} base permissions' diff --git a/data/reusables/projects/about-board-layout.md b/data/reusables/projects/about-board-layout.md index 1033edc03fe5..822f51d33492 100644 --- a/data/reusables/projects/about-board-layout.md +++ b/data/reusables/projects/about-board-layout.md @@ -1,3 +1,3 @@ The board layout spreads your issues, pull requests, and draft issues across customizable columns. You can create a kanban board by setting your column field to a "Status" field or set any other single select or iteration field as the column field. -You can drag {% ifversion projects-v2-board-drag-multiple %}individual or multiple items{% else %}items{% endif %} from column to column and the value of {% ifversion projects-v2-board-drag-multiple %}those items{% else %}the item{% endif %} will adjust to match the column you drag them to. +You can drag individual or multiple items from column to column and the value of those items will adjust to match the column you drag them to. diff --git a/data/reusables/projects/about-roadmap-layout.md b/data/reusables/projects/about-roadmap-layout.md index ca56a7438811..883ae91eff48 100644 --- a/data/reusables/projects/about-roadmap-layout.md +++ b/data/reusables/projects/about-roadmap-layout.md @@ -1,3 +1,3 @@ -The roadmap layout provides a high-level visualization of your project across a configurable timespan, and allows you to drag items to affect their start and target dates{% ifversion projects-v2-roadmap-markers %} or selected iteration{% endif %}. Roadmaps use your custom date and iteration fields to position your issues, pull requests, and draft issues on a timeline, allowing you to track work over time and watch progress. +The roadmap layout provides a high-level visualization of your project across a configurable timespan, and allows you to drag items to affect their start and target dates or selected iteration. Roadmaps use your custom date and iteration fields to position your issues, pull requests, and draft issues on a timeline, allowing you to track work over time and watch progress. -{% ifversion projects-v2-roadmap-markers %}You can also display vertical lines to highlight key dates for your project, including iterations, milestones, and the dates of items in your project. These markers help you get a clear overview of your upcoming workload and how it's distributed across iterations or milestones.{% endif %} +You can also display vertical lines to highlight key dates for your project, including iterations, milestones, and the dates of items in your project. These markers help you get a clear overview of your upcoming workload and how it's distributed across iterations or milestones. diff --git a/data/reusables/projects/create-project.md b/data/reusables/projects/create-project.md index 35b011a19ed6..a07625325807 100644 --- a/data/reusables/projects/create-project.md +++ b/data/reusables/projects/create-project.md @@ -16,6 +16,6 @@ ![Screenshot showing the template selection modal. The title field is highlighted with an orange outline.](/assets/images/help/projects-v2/projects-select-template-title.png) -1. Click a {% ifversion projects-v2-org-templates %}built-in template, a template from your organization{% else %}template{% endif %} or, to start with an empty project, click **Table**, **Roadmap**, or **Board**. +1. Click a built-in template, a template from your organization or, to start with an empty project, click **Table**, **Roadmap**, or **Board**. 1. Click **Create**. {%- endif %} diff --git a/data/reusables/projects/create-user-project.md b/data/reusables/projects/create-user-project.md index 58f08faa5883..32c733e6b9e6 100644 --- a/data/reusables/projects/create-user-project.md +++ b/data/reusables/projects/create-user-project.md @@ -16,6 +16,6 @@ ![Screenshot showing the template selection modal. The title field is highlighted with an orange outline.](/assets/images/help/projects-v2/projects-select-template-title.png) -1. Click a {% ifversion projects-v2-org-templates %}built-in template, a template from your organization{% else %}template{% endif %} or, to start with an empty project, click **Table**, **Roadmap**, or **Board**. +1. Click a built-in template, a template from your organization or, to start with an empty project, click **Table**, **Roadmap**, or **Board**. 1. Click **Create**. {%- endif %} From 615b34e8db4f263b019f9070356281dca98afd96 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:43:40 +0000 Subject: [PATCH 2/5] Hack week 2025: remove unneeded FBV instances (22) (#54017) --- .../about-self-hosted-runners.md | 2 +- ...anaging-access-to-self-hosted-runners-using-groups.md | 2 +- .../security-hardening-for-github-actions.md | 2 +- content/actions/sharing-automations/reusing-workflows.md | 2 +- .../controlling-access-to-larger-runners.md | 2 +- .../configuring-github-connect/about-github-connect.md | 4 ---- .../enabling-server-statistics-for-your-enterprise.md | 2 +- .../about-server-statistics.md | 2 +- .../exporting-server-statistics.md | 2 +- .../index.md | 2 +- .../requesting-server-statistics-using-the-rest-api.md | 2 +- .../streaming-the-audit-log-for-your-enterprise.md | 9 ++------- .../about-protected-branches.md | 4 +--- .../managing-a-branch-protection-rule.md | 2 -- data/reusables/actions/about-runner-groups.md | 2 +- .../actions/creating-a-runner-group-for-an-enterprise.md | 2 +- .../creating-a-runner-group-for-an-organization.md | 4 ++-- data/reusables/actions/oidc-permissions-token.md | 2 -- .../actions/runner-group-assign-policy-workflow.md | 2 +- data/reusables/organizations/require-ssh-cert.md | 2 +- 20 files changed, 19 insertions(+), 34 deletions(-) diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md index 04461ff15f93..3bdf525ad7c9 100644 --- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md @@ -53,7 +53,7 @@ For more information about installing and using self-hosted runners, see [AUTOTI * Are customizable to your hardware, operating system, software, and security requirements. * Don't need to have a clean instance for every job execution. * Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines.{% ifversion ghec or ghes %} -* Can be organized into groups to restrict access to specific {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups).{% endif %} +* Can be organized into groups to restrict access to specific workflows, organizations, and repositories. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups).{% endif %} ## Requirements for self-hosted runner machines diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md index 54cbe2387e4d..5775c1907856 100644 --- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -62,7 +62,7 @@ For runner groups in an organization, you can change what repositories in the or {% data reusables.actions.runner-groups-org-navigation %} {% data reusables.actions.changing-repository-access-for-a-runner-group %} -{% ifversion restrict-groups-to-workflows %} +{% ifversion ghec or ghes %} ## Changing which workflows can access a runner group diff --git a/content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md b/content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md index cae1ccab966d..184216a8871b 100644 --- a/content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md +++ b/content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md @@ -344,7 +344,7 @@ For third-party images, such as the images for ARM-powered runners, you can find {% data reusables.actions.disable-selfhosted-runners-crossrefs %} -When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.github %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups). +When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.github %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion ghec or ghes %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups). You should also consider the environment of the self-hosted runner machines: * What sensitive information resides on the machine configured as a self-hosted runner? For example, private SSH keys, API access tokens, among others. diff --git a/content/actions/sharing-automations/reusing-workflows.md b/content/actions/sharing-automations/reusing-workflows.md index 330eae4a8192..51bcf900f667 100644 --- a/content/actions/sharing-automations/reusing-workflows.md +++ b/content/actions/sharing-automations/reusing-workflows.md @@ -442,4 +442,4 @@ For information about using the REST API to query the audit log for an organizat To continue learning about {% data variables.product.prodname_actions %}, see [AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows). -{% ifversion restrict-groups-to-workflows %}You can standardize deployments by creating a self-hosted runner group that can only execute a specific reusable workflow. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups).{% endif %} +{% ifversion ghec or ghes %}You can standardize deployments by creating a self-hosted runner group that can only execute a specific reusable workflow. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups).{% endif %} diff --git a/content/actions/using-github-hosted-runners/using-larger-runners/controlling-access-to-larger-runners.md b/content/actions/using-github-hosted-runners/using-larger-runners/controlling-access-to-larger-runners.md index d2c4d6b870e9..8b79cbde320d 100644 --- a/content/actions/using-github-hosted-runners/using-larger-runners/controlling-access-to-larger-runners.md +++ b/content/actions/using-github-hosted-runners/using-larger-runners/controlling-access-to-larger-runners.md @@ -70,7 +70,7 @@ For runner groups in an organization, you can change what repositories in the or {% data reusables.actions.runner-groups-org-navigation %} {% data reusables.actions.changing-repository-access-for-a-runner-group %} -{% ifversion restrict-groups-to-workflows %} +{% ifversion ghec %} ## Changing which workflows can access a runner group diff --git a/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md b/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md index e3914baf4f31..7220c40f7d5b 100644 --- a/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md +++ b/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md @@ -47,9 +47,7 @@ If you're connecting to an enterprise on {% data variables.enterprise.data_resid {% data reusables.github-connect.license-sync %} | {% data variables.product.prodname_dependabot %} | Allow users to find and fix vulnerabilities in code dependencies. | [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise) | | {% data variables.product.prodname_dotcom_the_website %} actions | Allow users to use actions from {% data variables.product.prodname_dotcom_the_website %} in public workflow files. | [AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect) | -| {% ifversion server-statistics %} | | {% data variables.product.prodname_server_statistics %} | Analyze your own aggregate data from GitHub Enterprise Server, and help us improve GitHub products. | [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise) | -| {% endif %} | {% data reusables.github-connect.unified-search %} {% data reusables.github-connect.unified-contributions %} @@ -107,9 +105,7 @@ Additional data is transmitted if you enable individual features of {% data vari | {% endif %} | | {% data variables.product.prodname_dependabot_updates %} | Dependencies and the metadata for each dependency's repository

If a dependency is stored in a private repository on {% data variables.product.prodname_dotcom_the_website %}, data will only be transmitted if {% data variables.product.prodname_dependabot %} is configured and authorized to access that repository. | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} | | {% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}

From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} | -| {% ifversion server-statistics %} | | {% data variables.product.prodname_server_statistics %} | Aggregate metrics about your usage of {% data variables.product.prodname_ghe_server %}. For the complete list of metrics, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics#server-statistics-data-collected). | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} | -| {% endif %} | | Unified search | Search terms, search results | From {% data variables.product.prodname_ghe_cloud %} to {% data variables.product.product_name %}

From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.product_name %} | | Unified contributions | Contribution counts | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} | diff --git a/content/admin/configuring-settings/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md b/content/admin/configuring-settings/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md index ea187d21f596..69b89b3766e3 100644 --- a/content/admin/configuring-settings/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md +++ b/content/admin/configuring-settings/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md @@ -2,7 +2,7 @@ title: Enabling Server Statistics for your enterprise intro: 'You can analyze your own aggregate data from {% data variables.product.prodname_ghe_server %} and help us improve {% data variables.product.company_short %} products by enabling {% data variables.product.prodname_server_statistics %}.' versions: - feature: server-statistics + ghes: '*' redirect_from: - /early-access/github/analyze-how-your-team-works-with-server-statistics/about-server-statistics/enabling-server-statistics - /admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise diff --git a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md index d1eb5920d41c..decb2a004366 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md +++ b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md @@ -2,7 +2,7 @@ title: About Server Statistics intro: 'You can use {% data variables.product.prodname_server_statistics %} to analyze your own aggregate data from {% data variables.product.prodname_ghe_server %}, and help us improve {% data variables.product.company_short %} products.' versions: - feature: server-statistics + ghes: '*' permissions: 'Enterprise owners can enable {% data variables.product.prodname_server_statistics %}.' redirect_from: - /early-access/github/analyze-how-your-team-works-with-server-statistics/about-server-statistics diff --git a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md index 02e78a55578e..39de4d0f3f6e 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md +++ b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md @@ -3,7 +3,7 @@ title: Exporting Server Statistics shortTitle: Export Server Statistics intro: 'You can use your own tools to analyze your {% data variables.product.prodname_ghe_server %} usage over time by downloading your {% data variables.product.prodname_server_statistics %} metrics in a CSV or JSON file.' versions: - feature: server-statistics + ghes: '*' redirect_from: - /early-access/github/analyze-how-your-team-works-with-server-statistics/exploring-server-statistics --- diff --git a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md index af32d347455b..e6f53b0659c1 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md +++ b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md @@ -3,7 +3,7 @@ title: Analyzing how your team works with Server Statistics shortTitle: Server Statistics intro: 'To analyze how your team works, understand the value you get from {% data variables.product.prodname_ghe_server %}, and help us improve our products, you can use {% data variables.product.prodname_server_statistics %} to review your usage data for {% data variables.product.prodname_ghe_server %} and share this aggregate data with {% data variables.product.company_short %}.' versions: - feature: server-statistics + ghes: '*' children: - /about-server-statistics - /exporting-server-statistics diff --git a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md index 10763b23786e..08f8b999123c 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md +++ b/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md @@ -3,7 +3,7 @@ title: Requesting Server Statistics using the REST API shortTitle: Server Statistics and REST API intro: 'You can use your own tools to analyze your {% data variables.product.prodname_ghe_server %} usage over time by requesting the {% data variables.product.prodname_server_statistics %} metrics collected using the REST API.' versions: - feature: server-statistics + ghes: '*' redirect_from: - /early-access/github/analyze-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api --- diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md index 018a9f422a69..6060e159d5bc 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md @@ -58,8 +58,8 @@ To set up the audit log stream, follow the instructions for your provider: * [Amazon S3](#setting-up-streaming-to-amazon-s3) * [Azure Blob Storage](#setting-up-streaming-to-azure-blob-storage) -* [Azure Event Hubs](#setting-up-streaming-to-azure-event-hubs){% ifversion streaming-datadog %} -* [Datadog](#setting-up-streaming-to-datadog){% endif %} +* [Azure Event Hubs](#setting-up-streaming-to-azure-event-hubs) +* [Datadog](#setting-up-streaming-to-datadog) * [Google Cloud Storage](#setting-up-streaming-to-google-cloud-storage) * [Splunk](#setting-up-streaming-to-splunk) @@ -230,8 +230,6 @@ From {% data variables.product.prodname_dotcom %}: 1. Click **Check endpoint** to verify that {% data variables.product.prodname_dotcom %} can connect and write to the Azure Events Hub endpoint. {% data reusables.enterprise.verify-audit-log-streaming-endpoint %} -{% ifversion streaming-datadog %} - ### Setting up streaming to Datadog To set up streaming to Datadog, create a client token or an API key in Datadog, then configure audit log streaming in {% data variables.product.product_name %} using the token for authentication. You do not need to create a bucket or other storage container in Datadog. @@ -247,7 +245,6 @@ After you set up streaming to Datadog, you can see your audit log data by filter 1. To verify that {% data variables.product.prodname_dotcom %} can connect and write to the Datadog endpoint, click **Check endpoint**. {% data reusables.enterprise.verify-audit-log-streaming-endpoint %} 1. After a few minutes, confirm that audit log data appears on the **Logs** tab in Datadog. If it doesn't appear, confirm that your token and site are correct in {% data variables.product.prodname_dotcom %}. -{% endif %} ### Setting up streaming to Google Cloud Storage @@ -298,9 +295,7 @@ To stream audit logs to Splunk's HTTP Event Collector (HEC) endpoint, make sure Pause the stream to perform maintenance on the receiving application without losing audit data. Audit logs are stored for up to seven days on {% data variables.product.github %} and are then exported when you unpause the stream. -{% ifversion streaming-datadog %} Datadog only accepts logs from up to 18 hours in the past. If you pause a stream to a Datadog endpoint for more than 18 hours, you risk losing logs that Datadog won't accept after you resume streaming. -{% endif %} {% data reusables.enterprise.navigate-to-log-streaming-tab %} 1. To the right of your configured stream, click **Pause stream**. diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md index b666a67b0a87..39eea7fc9e2c 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md @@ -178,11 +178,9 @@ You can enable branch restrictions in public repositories owned by a {% data var When you enable branch restrictions, only users, teams, or apps that have been given permission can push to the protected branch. You can view and edit the users, teams, or apps with push access to a protected branch in the protected branch's settings. When status checks are required, the people, teams, and apps that have permission to push to a protected branch will still be prevented from merging into the branch when the required checks fail. People, teams, and apps that have permission to push to a protected branch will still need to create a pull request when pull requests are required. -{% ifversion restrict-pushes-create-branch %} Optionally, you can apply the same restrictions to the creation of branches that match the rule. For example, if you create a rule that only allows a certain team to push to any branches that contain the word `release`, only members of that team would be able to create a new branch that contains the word `release`. -{% endif %} -You can only give push access to a protected branch, or give permission to create a matching branch, to users, teams, or installed {% data variables.product.prodname_github_apps %} with write access to a repository. People and apps with admin permissions to a repository are always able to push to a protected branch{% ifversion restrict-pushes-create-branch %} or create a matching branch{% endif %}. +You can only give push access to a protected branch, or give permission to create a matching branch, to users, teams, or installed {% data variables.product.prodname_github_apps %} with write access to a repository. People and apps with admin permissions to a repository are always able to push to a protected branch or create a matching branch. ### Allow force pushes diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md index f1d016563fd7..23945486f227 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md @@ -92,9 +92,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet 1. Optionally, select **Do not allow bypassing the above settings**. 1. Optionally,{% ifversion fpt or ghec %} in public repositories owned by a {% data variables.product.prodname_free_user %} organization and in all repositories owned by an organization using {% data variables.product.prodname_team %} or {% data variables.product.prodname_ghe_cloud %},{% endif %} enable branch restrictions. * Select **Restrict who can push to matching branches**. -{%- ifversion restrict-pushes-create-branch %} * Optionally, to also restrict the creation of matching branches, select **Restrict pushes that create matching branches**. -{%- endif %} * In the search field, search for and select the people, teams, or apps who will have permission to push to the protected branch or create a matching branch. 1. Optionally, under "Rules applied to everyone including administrators", select **Allow force pushes**. diff --git a/data/reusables/actions/about-runner-groups.md b/data/reusables/actions/about-runner-groups.md index 124d4df4cf2d..69ebf31dba63 100644 --- a/data/reusables/actions/about-runner-groups.md +++ b/data/reusables/actions/about-runner-groups.md @@ -1,6 +1,6 @@ To control access to runners at the organization{% ifversion ghec or ghes %} and/or enterprise levels, enterprise and organization owners can use runner groups.{% else %} level, organizations using the {% data variables.product.prodname_team %} plan can use runner groups.{% endif %} Runner groups are used to collect sets of runners and create a security boundary around them. -When you grant access to a runner group, you can see the runner group listed in the organization's runner settings. Optionally, you can assign additional granular repository{% ifversion restrict-groups-to-workflows %} and workflow{% endif %} access policies to the runner group. +When you grant access to a runner group, you can see the runner group listed in the organization's runner settings. Optionally, you can assign additional granular repository{% ifversion ghec or ghes %} and workflow{% endif %} access policies to the runner group. When new runners are created, they are automatically assigned to the default group unless otherwise specified. Runners can only be in one group at a time. You can move runners from one runner group to another. For more information, see [Moving a runner to a group](#moving-a-runner-to-a-group). diff --git a/data/reusables/actions/creating-a-runner-group-for-an-enterprise.md b/data/reusables/actions/creating-a-runner-group-for-an-enterprise.md index 6b07063d03e1..b097c59131b7 100644 --- a/data/reusables/actions/creating-a-runner-group-for-an-enterprise.md +++ b/data/reusables/actions/creating-a-runner-group-for-an-enterprise.md @@ -7,7 +7,7 @@ Always include a security admonition above this procedure. This is either one of {% endcomment %} -Enterprises can add their runners to groups for access management. Enterprises can create groups of runners that are accessible to specific organizations in the enterprise account{% ifversion restrict-groups-to-workflows %} or to specific workflows{% endif %}. Organization owners can then assign additional granular repository{% ifversion restrict-groups-to-workflows %} or workflow{% endif %} access policies to the enterprise runner groups. For information about how to create a runner group with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions#self-hosted-runner-groups). +Enterprises can add their runners to groups for access management. Enterprises can create groups of runners that are accessible to specific organizations in the enterprise account{% ifversion ghec or ghes %} or to specific workflows{% endif %}. Organization owners can then assign additional granular repository{% ifversion ghec or ghes %} or workflow{% endif %} access policies to the enterprise runner groups. For information about how to create a runner group with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions#self-hosted-runner-groups). If no group is specified during the registration process, runners are automatically added to a default group. You can later move the runner from the default group to a custom group. For more information, see [Moving a runner to a group](#moving-a-runner-to-a-group). diff --git a/data/reusables/actions/creating-a-runner-group-for-an-organization.md b/data/reusables/actions/creating-a-runner-group-for-an-organization.md index 6669be433ba3..bab2497fb089 100644 --- a/data/reusables/actions/creating-a-runner-group-for-an-organization.md +++ b/data/reusables/actions/creating-a-runner-group-for-an-organization.md @@ -8,7 +8,7 @@ Always include a security admonition above this procedure. This is either one of {% endcomment %} > [!NOTE] -> When creating a runner group, you must choose a policy that defines which repositories{% ifversion restrict-groups-to-workflows %} and workflows{% endif %} have access to the runner group. To change which repositories and workflows can access the runner group, organization owners{% ifversion custom-org-roles %} and users with the “Manage organization runners and runner groups” permission{% endif %} can set a policy for the organization. For more information, see [AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#disabling-repository-level-self-hosted-runners). +> When creating a runner group, you must choose a policy that defines which repositories{% ifversion ghec or ghes %} and workflows{% endif %} have access to the runner group. To change which repositories and workflows can access the runner group, organization owners{% ifversion custom-org-roles %} and users with the “Manage organization runners and runner groups” permission{% endif %} can set a policy for the organization. For more information, see [AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#disabling-repository-level-self-hosted-runners). All organizations have a single default runner group. {% ifversion fpt %}Organization owners using the {% data variables.product.prodname_team %} plan{% else %}Organization owners{% ifversion custom-org-roles %} and users with the "Manage organization runners and runner groups" permission{% endif %}{% endif %} can create additional organization-level runner groups. {% ifversion custom-org-roles %}For more information about custom organization roles, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles).{% endif %} @@ -22,5 +22,5 @@ For information about how to create a runner group with the REST API, see [AUTOT 1. In the "Runner groups" section, click **New runner group**. 1. Enter a name for your runner group. {% data reusables.actions.runner-group-assign-policy-repo %} -{% data reusables.actions.runner-group-assign-policy-workflow %}{%- ifversion restrict-groups-to-workflows %} Organization-owned runner groups cannot access workflows from a different organization in the enterprise; instead, you must create an enterprise-owned runner group.{% endif %} +{% data reusables.actions.runner-group-assign-policy-workflow %}{%- ifversion ghec or ghes %} Organization-owned runner groups cannot access workflows from a different organization in the enterprise; instead, you must create an enterprise-owned runner group.{% endif %} {% data reusables.actions.create-runner-group %} diff --git a/data/reusables/actions/oidc-permissions-token.md b/data/reusables/actions/oidc-permissions-token.md index e8b2eac810e2..cbe483045715 100644 --- a/data/reusables/actions/oidc-permissions-token.md +++ b/data/reusables/actions/oidc-permissions-token.md @@ -20,7 +20,6 @@ permissions: id-token: write # This is required for requesting the JWT ``` -{% ifversion restricted-permissions-oidc %} You may need to specify additional permissions here, depending on your workflow's requirements. For reusable workflows that are owned by the same user, organization, or enterprise as the caller workflow, the OIDC token generated in the reusable workflow can be accessed from the caller's context. @@ -28,4 +27,3 @@ For reusable workflows outside your enterprise or organization, the `permissions This ensures that the OIDC token generated in the reusable workflow is only allowed to be consumed in the caller workflows when intended. For more information, see [AUTOTITLE](/actions/using-workflows/reusing-workflows). -{% endif %} diff --git a/data/reusables/actions/runner-group-assign-policy-workflow.md b/data/reusables/actions/runner-group-assign-policy-workflow.md index d7457da04c0d..3d1515d6347f 100644 --- a/data/reusables/actions/runner-group-assign-policy-workflow.md +++ b/data/reusables/actions/runner-group-assign-policy-workflow.md @@ -1,4 +1,4 @@ -{%- ifversion restrict-groups-to-workflows %} +{%- ifversion ghec or ghes %} 1. Assign a policy for workflow access. You can configure a runner group to be accessible to a specific list of workflows, or to all workflows. This setting can't be overridden if you are configuring an organization's runner group that was shared by an enterprise. If you specify what workflow can access the runner group, you must use the full path to the workflow, including the repository name and owner, and you must pin the workflow to a branch, tag, or full SHA. For example: `octo-org/octo-repo/.github/workflows/build.yml@v2, octo-org/octo-repo/.github/workflows/deploy.yml@d6dc6c96df4f32fa27b039f2084f576ed2c5c2a5, monalisa/octo-test/.github/workflows/test.yml@main`. diff --git a/data/reusables/organizations/require-ssh-cert.md b/data/reusables/organizations/require-ssh-cert.md index 612a2c9ac92e..77e36133f1e1 100644 --- a/data/reusables/organizations/require-ssh-cert.md +++ b/data/reusables/organizations/require-ssh-cert.md @@ -3,4 +3,4 @@ > [!NOTE] > When you require SSH certificates, users will not be able to authenticate to access the organization's repositories over HTTPS or with an unsigned SSH key{% ifversion ghes %}.{% elsif ghec %}, regardless of whether the SSH key is authorized for an organization that requires authentication through an external identity system.{% endif %} > - > The requirement does not apply to authorized {% data variables.product.prodname_github_apps %} {% ifversion ssh-cert-policy-allow-u2s-tokens %}(including user-to-server tokens){% endif %}, deploy keys, or to {% data variables.product.prodname_dotcom %} features such as {% data variables.product.prodname_actions %}{% ifversion fpt or ghec %} and {% data variables.product.prodname_codespaces %}{% endif %}, which are trusted environments within the {% data variables.product.prodname_dotcom %} ecosystem. + > The requirement does not apply to authorized {% data variables.product.prodname_github_apps %} (including user-to-server tokens), deploy keys, or to {% data variables.product.prodname_dotcom %} features such as {% data variables.product.prodname_actions %}{% ifversion fpt or ghec %} and {% data variables.product.prodname_codespaces %}{% endif %}, which are trusted environments within the {% data variables.product.prodname_dotcom %} ecosystem. From 49205b4aa872193289e41133a084566bc5d2fcaf Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:56:27 +0000 Subject: [PATCH 3/5] Hack week 2025: remove unneeded FBV instances (21) (#54014) --- .../re-running-workflows-and-jobs.md | 12 ++---------- .../monitoring-workflows/using-workflow-run-logs.md | 6 +----- .../configuring-email-for-notifications.md | 3 --- .../using-the-audit-log-api-for-your-enterprise.md | 2 +- .../monitoring-a-high-availability-configuration.md | 6 +----- .../building-oauth-apps/scopes-for-oauth-apps.md | 4 ++-- ...reviewing-the-audit-log-for-your-organization.md | 2 +- ...pproving-a-pull-request-with-required-reviews.md | 2 +- .../commenting-on-a-pull-request.md | 9 ++++----- .../reviewing-proposed-changes-in-a-pull-request.md | 3 +-- .../about-protected-branches.md | 4 ---- .../managing-a-branch-protection-rule.md | 4 ---- .../available-rules-for-rulesets.md | 2 -- .../transferring-a-repository.md | 2 +- ...nderstanding-connections-between-repositories.md | 13 ++----------- .../path-filtering-required-workflows.md | 2 +- data/reusables/releases/finish-release.md | 2 -- data/reusables/repositories/forks-page.md | 2 +- .../repositories/transfer-repository-steps.md | 6 ------ 19 files changed, 19 insertions(+), 67 deletions(-) diff --git a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md index 00306541e9ee..75ccfce64f73 100644 --- a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md +++ b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md @@ -1,7 +1,7 @@ --- title: Re-running workflows and jobs shortTitle: Re-run workflows and jobs -intro: 'You can re-run a workflow run{% ifversion re-run-jobs %}, all failed jobs in a workflow run, or specific jobs in a workflow run{% endif %} up to 30 days after its initial run.' +intro: 'You can re-run a workflow run, all failed jobs in a workflow run, or specific jobs in a workflow run up to 30 days after its initial run.' permissions: People with write permissions to a repository can re-run workflows in the repository. redirect_from: - /actions/managing-workflow-runs/re-running-a-workflow @@ -16,7 +16,7 @@ versions: ## About re-running workflows and jobs -Re-running a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} uses the same `GITHUB_SHA` (commit SHA) and `GITHUB_REF` (Git ref) of the original event that triggered the workflow run. The workflow will use the privileges of the actor who initially triggered the workflow, not the privileges of the actor who initiated the re-run. You can re-run a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} for up to 30 days after the initial run.{% ifversion re-run-jobs %} You cannot re-run jobs in a workflow once its logs have passed their retention limits. For more information, see [AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy).{% endif %} When you re-run a workflow or jobs in a workflow, you can enable debug logging for the re-run. This will enable runner diagnostic logging and step debug logging for the re-run. For more information about debug logging, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging). +Re-running a workflow or jobs in a workflow uses the same `GITHUB_SHA` (commit SHA) and `GITHUB_REF` (Git ref) of the original event that triggered the workflow run. The workflow will use the privileges of the actor who initially triggered the workflow, not the privileges of the actor who initiated the re-run. You can re-run a workflow or jobs in a workflow for up to 30 days after the initial run. You cannot re-run jobs in a workflow once its logs have passed their retention limits. For more information, see [AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy). When you re-run a workflow or jobs in a workflow, you can enable debug logging for the re-run. This will enable runner diagnostic logging and step debug logging for the re-run. For more information about debug logging, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging) ## Re-running all the jobs in a workflow @@ -60,8 +60,6 @@ gh run watch {% endcli %} -{% ifversion re-run-jobs %} - ## Re-running failed jobs in a workflow If any jobs in a workflow run failed, you can re-run just the jobs that failed. When you re-run failed jobs in a workflow, a new workflow run will start for all failed jobs and their dependents. Any outputs for any successful jobs in the previous workflow run will be used for the re-run. Any artifacts that were created in the initial run will be available in the re-run. Any deployment protection rules that passed in the previous run will automatically pass in the re-run. @@ -125,8 +123,6 @@ gh run rerun --job JOB_ID --debug {% endcli %} -{% endif %} - {% ifversion partial-reruns-with-reusable %} ## Re-running workflows and jobs with reusable workflows @@ -143,8 +139,4 @@ You can view the results from your previous attempts at running a workflow. You {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -{%- ifversion re-run-jobs %} 1. To the right of the run name, select the **Latest** dropdown menu and click a previous run attempt. -{%- else %} -1. In the left pane, click a previous run attempt. -{%- endif %} diff --git a/content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/using-workflow-run-logs.md b/content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/using-workflow-run-logs.md index d6a3d6650d94..dc9a20b25edc 100644 --- a/content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/using-workflow-run-logs.md +++ b/content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/using-workflow-run-logs.md @@ -10,7 +10,7 @@ versions: ghes: '*' ghec: '*' --- - + {% data reusables.actions.enterprise-github-hosted-runners %} You can see whether a workflow run is in progress or complete from the workflow run page. You must be logged in to a {% data variables.product.prodname_dotcom %} account to view workflow run information, including for public repositories. For more information, see [AUTOTITLE](/get-started/learning-about-github/access-permissions-on-github). @@ -61,13 +61,9 @@ You can download the log files from your workflow run. You can also download a w ![Screenshot of the log for a job. In the header, a gear icon is outlined in dark orange.](/assets/images/help/actions/download-logs-drop-down.png) - {% ifversion re-run-jobs %} - > [!NOTE] > When you download the log archive for a workflow that was partially re-run, the archive only includes the jobs that were re-run. To get a complete set of logs for jobs that were run from a workflow, you must download the log archives for the previous run attempts that ran the other jobs. - {% endif %} - ## Deleting logs You can delete the log files from your workflow runs through the {% data variables.product.prodname_dotcom %} web interface or programmatically. {% data reusables.repositories.permissions-statement-write %} diff --git a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md index 449b0bd6798d..2b74c1877e41 100644 --- a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md +++ b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md @@ -52,8 +52,6 @@ settings to allow incoming emails](#configuring-dns-and-firewall-settings-to-all 1. When the test email succeeds, under the "Settings" sidebar, click **Save settings**. {% data reusables.enterprise_site_admin_settings.wait-for-configuration-run %} -{% ifversion require-tls-for-smtp %} - ## Enforcing TLS for SMTP connections You can enforce TLS encryption for all incoming SMTP connections, which can help satisfy an ISO-27017 certification requirement. @@ -63,7 +61,6 @@ You can enforce TLS encryption for all incoming SMTP connections, which can help ![Screenshot of the "Email" section of the Management Console. A checkbox, labeled "Enforce TLS auth (recommended)", is outlined in dark orange.](/assets/images/enterprise/configuration/enforce-tls-for-smtp-checkbox.png) {% data reusables.enterprise_management_console.save-settings %} -{% endif %} ## Configuring DNS and firewall settings to allow incoming emails diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise.md index fc948b0d6d5b..ef2f0dc21f7f 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise.md @@ -30,7 +30,7 @@ For more information about the specific events that you can access via the audit Timestamps and date fields in the API response are measured in [UTC epoch milliseconds](https://en.wikipedia.org/wiki/Unix_time). -{% ifversion read-audit-scope %}You can use the `read:audit_log` scope to access the audit log via the API.{% endif %} +You can use the `read:audit_log` scope to access the audit log via the API. {% ifversion ghec %} diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md b/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md index d876fee255c0..4402e9a043b2 100644 --- a/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md +++ b/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md @@ -20,7 +20,7 @@ redirect_from: {% data reusables.enterprise.about-ha %} For more information, see [AUTOTITLE](/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration). -After you configure high availability, you can proactively ensure redundancy by monitoring the overall health of replication and the status of each of your instance's replica nodes. You can use command-line utilities on the instance, an overview dashboard, {% ifversion replication-management-api %}the instance's REST API, {% endif %}or a remote monitoring system such as Nagios. +After you configure high availability, you can proactively ensure redundancy by monitoring the overall health of replication and the status of each of your instance's replica nodes. You can use command-line utilities on the instance, an overview dashboard, the instance's REST API, or a remote monitoring system such as Nagios. With high availability, your instance uses several approaches to replicate data between primary and replica nodes. Database services that support a native replication mechanism, such as MySQL, replicate using the service's native mechanism. Other services, such as Git repositories, replicate using a custom mechanism developed for {% data variables.product.product_name %}, or using platform tools like rsync. @@ -40,14 +40,10 @@ You can monitor replication status on your instance using the `gh es` extension {% endif %} -{% ifversion replication-management-api %} - ## Monitoring replication using the REST API You can monitor replication status on your instance using the REST API. For more information, see [Manage {% data variables.product.product_name %}](/rest/enterprise-admin/manage-ghes#list-the-status-of-services-running-on-all-replica-nodes) in the REST API documentation. -{% endif %} - ## Monitoring replication from a remote system Output from the `ghe-repl-status` command-line utility conforms to the expectations of Nagios' check_by_ssh plugin. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-repl-status). diff --git a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md index 6b28aa64ff31..f1c9d77cce49 100644 --- a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -81,8 +81,8 @@ Name | Description **`admin:enterprise`** | Gives full control of enterprise functionality. For more information, see [AUTOTITLE](/graphql/guides/managing-enterprise-accounts) in the GraphQL API documentation.

Includes `manage_runners:enterprise`{% ifversion ghec or ghes %}, `manage_billing:enterprise`,{% endif %} and `read:enterprise`.  `manage_runners:enterprise` | Gives full control over self-hosted runners within the enterprise. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners). {% ifversion ghec or ghes %}  `manage_billing:enterprise` | Read and write enterprise billing data. For more information, see [AUTOTITLE](/rest/billing). {% endif %} - `read:enterprise` | Read all data on an enterprise profile. Does not include profile data of enterprise members or organizations.{% endif %}{% ifversion read-audit-scope %} -**`read:audit_log`** | Read audit log data.{% endif %} + `read:enterprise` | Read all data on an enterprise profile. Does not include profile data of enterprise members or organizations.{% endif %} +**`read:audit_log`** | Read audit log data. > [!NOTE] > Your {% data variables.product.prodname_oauth_app %} can request the scopes in the initial redirection. You can specify multiple scopes by separating them with a space using `%20`: 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 0730427ddeea..48294477ff92 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 @@ -201,7 +201,7 @@ Organizations that use {% data variables.product.prodname_ghe_cloud %} can inter {% else %} -You can interact with the audit log using the GraphQL API{% ifversion fpt or ghec %} or the REST API{% endif %}.{% ifversion read-audit-scope %} You can use the `read:audit_log` scope to access the audit log via the APIs.{% endif %} +You can interact with the audit log using the GraphQL API{% ifversion fpt or ghec %} or the REST API{% endif %}. You can use the `read:audit_log` scope to access the audit log via the APIs. {% ifversion ghec %} diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md index 5bfd911f1288..5968b5cb35f9 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md @@ -26,7 +26,7 @@ You can comment on a pull request, approve the changes, or request improvements {% data reusables.repositories.sidebar-pr %} {% data reusables.repositories.choose-pr-review %} {% data reusables.repositories.changed-files %} -1. Review the changes in the pull request, and optionally, comment on specific lines{% ifversion pull-request-comment-on-file %} or files{% endif %}. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request#starting-a-review). +1. Review the changes in the pull request, and optionally, comment on specific lines or files. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request#starting-a-review). {% data reusables.repositories.review-changes %} {% data reusables.repositories.review-summary-comment %} 1. Select **Approve** to approve merging the changes proposed in the pull request. diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md index 1e53877b386c..519e68fc29e8 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md @@ -21,14 +21,14 @@ shortTitle: Comment on a PR You can comment on a pull request's **Conversation** tab to leave general comments, questions, or props. You can also suggest changes that the author of the pull request can apply directly from your comment. -You can also comment on specific {% ifversion pull-request-comment-on-file %}files or {% endif %}sections of a file in a pull request's **Files changed** tab in the form of individual line {% ifversion pull-request-comment-on-file %}or file {% endif %}comments, or as part of a pull request review. Adding line {% ifversion pull-request-comment-on-file %}or file {% endif %}comments is a great way to discuss questions about implementation or provide feedback to the author. For more information about pull request reviews, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews). +You can also comment on specific files or sections of a file in a pull request's **Files changed** tab in the form of individual line or file comments, or as part of a pull request review. Adding line or file comments is a great way to discuss questions about implementation or provide feedback to the author. For more information about pull request reviews, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews). -For more information on adding line {% ifversion pull-request-comment-on-file %}or file {% endif %}comments to a pull request review, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request). +For more information on adding line or file comments to a pull request review, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request). > [!NOTE] > If you reply to a pull request via email, your comment will be added on the **Conversation** tab and will not be part of a pull request review. -To reply to an existing line {% ifversion pull-request-comment-on-file %}or file {% endif %}comment, you'll need to navigate to the comment on either the **Conversation** tab or **Files changed** tab and add an additional comment below it. +To reply to an existing line or file comment, you'll need to navigate to the comment on either the **Conversation** tab or **Files changed** tab and add an additional comment below it. > [!TIP] > * Pull request comments support the same [formatting](/get-started/writing-on-github) as regular comments on {% data variables.product.github %}, such as @mentions, emoji, and references. @@ -43,8 +43,7 @@ To reply to an existing line {% ifversion pull-request-comment-on-file %}or file {% data reusables.repositories.multiple-lines-comment %} {% data reusables.repositories.type-line-comment %} {% data reusables.repositories.suggest-changes %} -{% ifversion pull-request-comment-on-file %} -{% data reusables.repositories.start-file-comment %}{% endif %} +{% data reusables.repositories.start-file-comment %} 1. When you're done, click **Add single comment**. Anyone watching the pull request or repository will receive a notification of your comment. diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md index ae7303d65be4..2cd963e17e25 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md @@ -40,8 +40,7 @@ You can change the format of the diff view in this tab by clicking {% octicon "g {% data reusables.repositories.multiple-lines-comment %} {% data reusables.repositories.type-line-comment %} {% data reusables.repositories.suggest-changes %} -{% ifversion pull-request-comment-on-file %} -{% data reusables.repositories.start-file-comment %}{% endif %} +{% data reusables.repositories.start-file-comment %} 1. When you're done, click **Start a review**. If you have already started a review, you can click **Add review comment**. Before you submit your review, your line comments are _pending_ and only visible to you. You can edit pending comments anytime before you submit your review. To cancel a pending review, including all of its pending comments, click **Review changes** above the changed code, then click **Abandon review**. diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md index 39eea7fc9e2c..5064e5190ddf 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md @@ -55,9 +55,7 @@ For each branch protection rule, you can choose to enable or disable the followi {% ifversion merge-queue %} * [Require merge queue](#require-merge-queue) {% endif %} -{%- ifversion required-deployments %} * [Require deployments to succeed before merging](#require-deployments-to-succeed-before-merging) -{%- endif %} * [Lock branch](#lock-branch) * [Do not allow bypassing the above settings](#do-not-allow-bypassing-the-above-settings) * [Restrict who can push to matching branches](#restrict-who-can-push-to-matching-branches) @@ -93,9 +91,7 @@ Optionally, you can require that the most recent reviewable push must be approve For complex pull requests that require many reviews, requiring an approval from someone other than the last person to push can be a compromise that avoids the need to dismiss all stale reviews: with this option, "stale" reviews are not dismissed, and the pull request remains approved as long as someone other than the person who made the most recent changes approves it. Users who have already reviewed a pull request can reapprove after the most recent push to meet this requirement. If you are concerned about pull requests being "hijacked" (where unapproved content is added to approved pull requests), it is safer to dismiss stale reviews. -{% ifversion pull-request-mergeability-security-changes %} {% data reusables.pull_requests.security-changes-mergeability %} -{% endif %} ### Require status checks before merging diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md index 23945486f227..72b783aedb24 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md @@ -61,9 +61,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} 1. Optionally, enable required pull requests. -{% ifversion pull-request-mergeability-security-changes %} {% indented_data_reference reusables.pull_requests.security-changes-mergeability spaces=3 %} -{% endif %} * Under "Protect matching branches", select **Require a pull request before merging**. * Optionally, to require approvals before a pull request can be merged, select **Require approvals**. @@ -83,9 +81,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet {%- ifversion merge-queue %} 1. Optionally, to merge pull requests using a merge queue, select **Require merge queue**. {% data reusables.pull_requests.merge-queue-references %} {%- endif %} -{%- ifversion required-deployments %} 1. Optionally, to choose which environments the changes must be successfully deployed to before merging, select **Require deployments to succeed before merging**, then select the environments. -{%- endif %} 1. Optionally, make the branch read-only. * Select **Lock branch**. * Optionally, to allow fork syncing, select **Allow fork syncing**. diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md index 275f232a765c..71bd27fbc811 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md @@ -106,9 +106,7 @@ You can require that all changes to the target branch be associated with a pull ### Additional settings -{% ifversion pull-request-mergeability-security-changes %} {% data reusables.pull_requests.security-changes-mergeability %} -{% endif %} {% data reusables.pull_requests.required-reviews-for-prs-summary %} diff --git a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index 139a32eef75a..a1b02ed91e62 100644 --- a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -23,7 +23,7 @@ topics: --- ## About repository transfers -When you transfer a repository to a new owner, they can immediately administer the repository's contents, issues, pull requests, releases, {% data variables.product.prodname_projects_v1 %}, and settings. {% ifversion rename-and-transfer-repository %}You can also change the repository name while transferring a repository. See [AUTOTITLE](/repositories/creating-and-managing-repositories/renaming-a-repository).{% endif %} +When you transfer a repository to a new owner, they can immediately administer the repository's contents, issues, pull requests, releases, {% data variables.product.prodname_projects_v1 %}, and settings. You can also change the repository name while transferring a repository. See [AUTOTITLE](/repositories/creating-and-managing-repositories/renaming-a-repository). Prerequisites for repository transfers: * When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %} diff --git a/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md b/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md index b74380b8f879..c8bde9f9f2af 100644 --- a/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md +++ b/content/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories.md @@ -41,7 +41,7 @@ The network graph displays the branch history of the entire repository network, ## Listing the forks of a repository -The {% ifversion repositories-forks-page-improvement %} forks page {% else %} Members graph {% endif %} lists the forks of a repository. {% ifversion repositories-forks-page-improvement %} For each fork, you can see: +The forks page lists the forks of a repository. For each fork, you can see: * How many times the fork has been starred * The number of direct forks (of the fork) @@ -54,13 +54,7 @@ You can filter the list of forks to display active, inactive, starred, or archiv If you want to preserve the filters you have selected, you can save your filter and sort selections as the default so that any forks page you view, in any repository, will be filtered the same way. -{% else %} - -Forks are listed alphabetically by the organization or username of the person who forked the repository. You can click on the organization or username to be redirected to the organization or user's {% data variables.product.product_name %} profile page or click on the fork name to be redirected to the specific fork of the repository. - -{% endif %} - -### Accessing the {% ifversion repositories-forks-page-improvement %}forks page {% else %}Members graph{% endif %} +### Accessing the forks page {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} @@ -68,7 +62,6 @@ Forks are listed alphabetically by the organization or username of the person wh ![Screenshot of the left sidebar. The "Forks" tab is highlighted with a dark orange outline.](/assets/images/help/graphs/graphs-sidebar-forks-tab.png) -{% ifversion repositories-forks-page-improvement %} 1. Optionally, to filter the list to display forks updated within a specified time period, click **Period**, then choose a time period from the dropdown menu. For example, to see forks that have been updated within the last two years, choose "2 years" from the dropdown menu. ![Screenshot of the forks page with filter and sort options shown. The dropdown menu, titled "Period", is highlighted with an orange outline.](/assets/images/help/graphs/repository-forks-page-period-dropdown.png) @@ -85,8 +78,6 @@ Forks are listed alphabetically by the organization or username of the person wh ![Screenshot of the forks page with filter and sort options shown. The "Defaults saved" button is disabled because the defaults are already saved.](/assets/images/help/graphs/repository-forks-page-save-defaults-button.png) -{% endif %} - ## Viewing the dependencies of a repository You can use the dependency graph to explore the code your repository depends on. diff --git a/data/reusables/pull_requests/path-filtering-required-workflows.md b/data/reusables/pull_requests/path-filtering-required-workflows.md index 935ecb0048fe..64edf433bef6 100644 --- a/data/reusables/pull_requests/path-filtering-required-workflows.md +++ b/data/reusables/pull_requests/path-filtering-required-workflows.md @@ -1,6 +1,6 @@ {% ifversion required-workflows-deprecation %} -You should not use path or branch filtering to skip workflow runs if the workflow is required. For more information, see [AUTOTITLE](/actions/managing-workflow-runs/skipping-workflow-runs){% ifversion required-workflows %} and [AUTOTITLE](/actions/using-workflows/required-workflows){% endif %}. +You should not use path or branch filtering to skip workflow runs if the workflow is required. For more information, see [AUTOTITLE](/actions/managing-workflow-runs/skipping-workflow-runs) and [AUTOTITLE](/actions/using-workflows/required-workflows). {% endif %} diff --git a/data/reusables/releases/finish-release.md b/data/reusables/releases/finish-release.md index 0ebf9b848d25..2d34d4e95653 100644 --- a/data/reusables/releases/finish-release.md +++ b/data/reusables/releases/finish-release.md @@ -1,8 +1,6 @@ 1. Optionally, to include binary files such as compiled programs in your release, drag and drop or manually select files in the binaries box. 1. Optionally, to notify users that the release is not ready for production and may be unstable, select **This is a pre-release**. -{%- ifversion releases-set-latest-release %} 1. Optionally, select **Set as latest release**. If you do not select this option, the latest release label will automatically be assigned based on semantic versioning. -{%- endif %} {%- ifversion discussions %} 1. Optionally, if {% data variables.product.prodname_discussions %} is enabled for the repository, create a discussion for the release. * Select **Create a discussion for this release**. diff --git a/data/reusables/repositories/forks-page.md b/data/reusables/repositories/forks-page.md index 3e8a852358a7..2f499dc0bf7f 100644 --- a/data/reusables/repositories/forks-page.md +++ b/data/reusables/repositories/forks-page.md @@ -1 +1 @@ -{% ifversion repositories-forks-page-improvement %}You can view, sort, and filter the forks of a repository on the repository's forks page. For more information, see [AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories#listing-the-forks-of-a-repository).{% endif %} +You can view, sort, and filter the forks of a repository on the repository's forks page. For more information, see [AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/understanding-connections-between-repositories#listing-the-forks-of-a-repository). diff --git a/data/reusables/repositories/transfer-repository-steps.md b/data/reusables/repositories/transfer-repository-steps.md index f58d8fb2fe4d..2a4cea05b9c4 100644 --- a/data/reusables/repositories/transfer-repository-steps.md +++ b/data/reusables/repositories/transfer-repository-steps.md @@ -1,4 +1,3 @@ -{%- ifversion rename-and-transfer-repository %} 1. At the bottom of the page, in the "Danger Zone" section, click **Transfer**. 1. Read the information about transferring a repository, then, under "New owner", choose how to specify the new owner. * To choose one of your organizations, select **Select one of my organizations**. @@ -12,8 +11,3 @@ * To specify an organization or username, select **Specify an organization or username**, then type the organization name or the new owner's username. 1. Read the warnings about potential loss of features depending on the new owner's {% data variables.product.prodname_dotcom %} subscription. 1. Following **Type REPOSITORY NAME to confirm**, type the name of the repository you'd like to transfer, then click **I understand, transfer this repository**. -{%- else %} -1. At the bottom of the page, under "Danger Zone", click **Transfer**. -1. Read the warnings and enter the repository name to confirm that you've done so. -1. In the text box, type the name of the new owner and click **I understand, transfer this repo**. -{%- endif %} From 392b52aa918d4580546c61ded50ce3afea5eeeaa Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:08:41 +0000 Subject: [PATCH 4/5] Hack week 2025: remove unneeded FBV instances (23) (#54018) --- .../using-labels-with-self-hosted-runners.md | 2 +- .../using-self-hosted-runners-in-a-workflow.md | 18 +++++------------- .../disabling-and-enabling-a-workflow.md | 13 +------------ .../manually-running-a-workflow.md | 5 +---- .../about-the-audit-log-for-your-enterprise.md | 4 ++-- ...-log-events-performed-by-an-access-token.md | 3 ++- ...rching-the-audit-log-for-your-enterprise.md | 5 ----- .../about-team-discussions.md | 3 +-- .../creating-a-team-discussion.md | 2 -- .../editing-or-deleting-a-team-discussion.md | 2 -- .../collaborating-with-your-team/index.md | 2 -- .../pinning-a-team-discussion.md | 2 -- .../about-teams.md | 2 +- .../configuring-team-notifications.md | 4 +++- ...g-team-discussions-for-your-organization.md | 2 -- .../working-with-forks/syncing-a-fork.md | 8 -------- data/reusables/actions/about-runner-groups.md | 2 -- .../actions/jobs/choosing-runner-overview.md | 3 +-- ...ion-using-unique-names-for-runner-groups.md | 4 +--- .../audit-log-search-list-info-about-action.md | 2 +- 20 files changed, 20 insertions(+), 68 deletions(-) diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners.md index ef7eee7ec3db..ef75817a61c0 100644 --- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners.md @@ -13,7 +13,7 @@ shortTitle: Label runners {% data reusables.actions.enterprise-github-hosted-runners %} -For information on how to use labels to route jobs to specific types of self-hosted runners, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow). {% ifversion target-runner-groups %}You can also route jobs to runners in a specific group. For more information, see [AUTOTITLE](/actions/using-jobs/choosing-the-runner-for-a-job#targeting-runners-in-a-group).{% endif %} +For information on how to use labels to route jobs to specific types of self-hosted runners, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow). You can also route jobs to runners in a specific group. For more information, see [AUTOTITLE](/actions/using-jobs/choosing-the-runner-for-a-job#targeting-runners-in-a-group). {% data reusables.actions.self-hosted-runner-management-permissions-required %} diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow.md index 4cbdecc86572..0e64a9ed9e9e 100644 --- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow.md +++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/using-self-hosted-runners-in-a-workflow.md @@ -1,6 +1,6 @@ --- title: Using self-hosted runners in a workflow -intro: 'To use self-hosted runners in a workflow, you can use labels{% ifversion target-runner-groups %} or groups{% endif %} to specify the runner for a job.' +intro: 'To use self-hosted runners in a workflow, you can use labels or groups to specify the runner for a job.' redirect_from: - /github/automating-your-workflow-with-github-actions/using-self-hosted-runners-in-a-workflow - /actions/automating-your-workflow-with-github-actions/using-self-hosted-runners-in-a-workflow @@ -15,7 +15,7 @@ shortTitle: Use runners in a workflow {% data reusables.actions.enterprise-github-hosted-runners %} -You can target self-hosted runners for use in a workflow based on the labels assigned to the runners{% ifversion target-runner-groups %}, or their group membership, or a combination of these{% endif %}. +You can target self-hosted runners for use in a workflow based on the labels assigned to the runners, or their group membership, or a combination of these. >[!IMPORTANT]Runner Scale Sets do not support multiple labels, only the name of the runner can be used in place of a label. See [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller). @@ -27,8 +27,6 @@ Labels allow you to send workflow jobs to specific types of self-hosted runners, For information on creating custom and default labels, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners). -{% ifversion target-runner-groups %} - ## About self-hosted runner groups For self-hosted runners defined at the organization {% ifversion ghec or ghes %}or enterprise levels{% else %}level{% endif %}, you can group your runners with shared characteristics into a single runner group and then configure your job to target the runner group. @@ -37,8 +35,6 @@ To specify a self-hosted runner group for your job, configure `runs-on.group` in For information on creating and managing runner groups, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups). -{% endif %} - {% ifversion repository-actions-runners %} ## Viewing available runners for a repository @@ -95,8 +91,6 @@ runs-on: [self-hosted, linux, x64, gpu] These labels operate cumulatively, so a self-hosted runner must have all four labels to be eligible to process the job. -{% ifversion target-runner-groups %} - ## Using groups to route jobs {% data reusables.actions.jobs.example-runs-on-groups %} @@ -105,13 +99,11 @@ These labels operate cumulatively, so a self-hosted runner must have all four la {% data reusables.actions.jobs.example-runs-on-labels-and-groups %} -{% endif %} - ## Routing precedence for self-hosted runners -When routing a job to a self-hosted runner, {% data variables.product.prodname_dotcom %} looks for a runner that matches the job's `runs-on` labels{% ifversion target-runner-groups %} and groups{% endif %}: +When routing a job to a self-hosted runner, {% data variables.product.prodname_dotcom %} looks for a runner that matches the job's `runs-on` labels and groups: -* If {% data variables.product.prodname_dotcom %} finds an online and idle runner that matches the job's `runs-on` labels{% ifversion target-runner-groups %} and groups{% endif %}, the job is then assigned and sent to the runner. +* If {% data variables.product.prodname_dotcom %} finds an online and idle runner that matches the job's `runs-on` labels and groups, the job is then assigned and sent to the runner. * If the runner doesn't pick up the assigned job within 60 seconds, the job is re-queued so that a new runner can accept it. -* If {% data variables.product.prodname_dotcom %} doesn't find an online and idle runner that matches the job's `runs-on` labels {% ifversion target-runner-groups %} and groups{% endif %}, then the job will remain queued until a runner comes online. +* If {% data variables.product.prodname_dotcom %} doesn't find an online and idle runner that matches the job's `runs-on` labels and groups, then the job will remain queued until a runner comes online. * If the job remains queued for more than 24 hours, the job will fail. diff --git a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow.md index 3d7091596512..346ce637c8ca 100644 --- a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -36,15 +36,7 @@ You can also disable and enable a workflow using the REST API. For more informat 1. In the left sidebar, click the workflow you want to disable. 1. Click {% octicon "kebab-horizontal" aria-label="Show workflow options" %} to display a dropdown menu and click **Disable workflow**. - {% ifversion workflow-nav-2022 -%} ![Screenshot of a workflow. The "Show workflow options" button, shown with a kebab icon, and the "Disable workflow" menu item are outlined in orange.](/assets/images/help/repository/actions-disable-workflow-2022.png) - {%- else -%} - ![Screenshot of a workflow. Features apart from the "Disable workflow" menu item are grayed out.](/assets/images/help/repository/actions-disable-workflow.png) - - The disabled workflow is marked {% octicon "stop" aria-label="The stop icon" %} to indicate its status. - - ![Screenshot showing the actions list. The name of the disabled "Greet Everyone" workflow is prefixed with a stop icon.](/assets/images/help/repository/actions-find-disabled-workflow.png) - {%- endif %} {% endwebui %} @@ -70,11 +62,8 @@ You can re-enable a workflow that was previously disabled. {% data reusables.repositories.actions-tab %} 1. In the left sidebar, click the workflow you want to enable. - {% ifversion workflow-nav-2022 -%} ![Screenshot of the "Actions" page. In the left sidebar, a workflow name is highlighted with an outline in dark orange.](/assets/images/help/repository/actions-select-disabled-workflow-2022.png) - {%- else -%} - ![Screenshot of the "Actions" page. Features are grayed out apart from one workflow name in the left sidebar.](/assets/images/help/repository/actions-select-disabled-workflow.png) - {%- endif %} + 1. Click **Enable workflow**. {% endwebui %} diff --git a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow.md b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow.md index 1bd5567432a0..9e50e485705d 100644 --- a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow.md +++ b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow.md @@ -29,11 +29,8 @@ To trigger the `workflow_dispatch` event, your workflow must be in the default b {% data reusables.repositories.actions-tab %} 1. In the left sidebar, click the name of the workflow you want to run. - {% ifversion workflow-nav-2022 -%} ![Screenshot of the "Actions" page. In the left sidebar, a workflow name is highlighted with an outline in dark orange.](/assets/images/help/repository/actions-select-workflow-2022.png) - {%- else -%} - ![Screenshot of the "Actions" page. Features apart from one workflow in the left sidebar are grayed out.](/assets/images/help/repository/actions-select-workflow.png) - {%- endif %} + 1. Above the list of workflow runs, click the **Run workflow** button. > [!NOTE] diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md index 0f48748aae96..7231a6202929 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md @@ -42,8 +42,8 @@ In addition to viewing your audit log, you can monitor activity in your enterpri As an enterprise owner{% ifversion ghes %} or site administrator{% endif %}, you can interact with the audit log data for your enterprise in several ways: * You can view the audit log for your enterprise. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise). -* You can search the audit log for specific events{% ifversion ghec %} and export audit log data{% endif %}. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise){% ifversion ghec %} and [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise){% endif %}.{% ifversion token-audit-log %} -* You can identify all events that were performed by a specific access token. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token).{% endif %}{% ifversion ghes %} +* You can search the audit log for specific events{% ifversion ghec %} and export audit log data{% endif %}. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise){% ifversion ghec %} and [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise){% endif %}. +* You can identify all events that were performed by a specific access token. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token).{% ifversion ghes %} * You can configure settings, such as the retention period for audit log events and whether Git events are included. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/configuring-the-audit-log-for-your-enterprise).{% endif %} {%- ifversion enterprise-audit-log-ip-addresses %} * You can display the IP address associated with events in the audit log. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/displaying-ip-addresses-in-the-audit-log-for-your-enterprise). diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token.md index d0ca38bbf6b9..f71d312892eb 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token.md @@ -3,7 +3,8 @@ title: Identifying audit log events performed by an access token shortTitle: Identify events by token intro: 'You can identify the actions performed by a specific token in your enterprise.' versions: - feature: token-audit-log + ghes: '*' + ghec: '*' topics: - Organizations - Authentication diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md index a1d073792a5f..e665c2520ef5 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md @@ -73,9 +73,7 @@ The `key:value` pairs that can be used in a search query are: | {% ifversion ghes %} | | `business_id` | ID of the enterprise affected by the action (if applicable). | | {% endif %} | -| {% ifversion token-audit-log %} | | `created` | Time at which the action occurred.{% ifversion ghes %} If querying the audit log from the site admin dashboard, use `created_at` instead. | -| {% endif %} | | `country` | Name of the country where the actor was when performing the action. | | `country_code` | Two-letter short code of the country where the actor was when performing the action. | | {% ifversion ghes %} | @@ -162,9 +160,6 @@ Using the qualifier `country`, you can filter events in the audit log based on t * `country:Mexico` finds all events that occurred in Mexico. * `country:"United States"` all finds events that occurred in the United States. -{% ifversion token-audit-log %} - ### Search based on the token that performed the action Use the `hashed_token` qualifier to search based on the token that performed the action. Before you can search for a token, you must generate a SHA-256 hash. For more information, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token). -{% endif %} 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 d51578b0ab9e..4c3cd972087f 100644 --- a/content/organizations/collaborating-with-your-team/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -10,9 +10,8 @@ versions: topics: - Community --- -{% ifversion team-discussions-migration %} + {% data reusables.organizations.team-discussions-migration %} -{% endif %} {% data reusables.organizations.team-discussions-purpose %} diff --git a/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md index 0bb24193f69c..1eca053031e1 100644 --- a/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md @@ -12,9 +12,7 @@ topics: shortTitle: Create a team discussion --- -{% ifversion team-discussions-migration %} {% data reusables.organizations.team-discussions-migration %} -{% endif %} {% data reusables.organizations.team-discussions-permissions %} For more information, see [AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions). diff --git a/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md index eb95e79a1428..13af73bf1193 100644 --- a/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md @@ -12,9 +12,7 @@ topics: shortTitle: Manage a team discussion --- -{% ifversion team-discussions-migration %} {% data reusables.organizations.team-discussions-migration %} -{% endif %} {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} diff --git a/content/organizations/collaborating-with-your-team/index.md b/content/organizations/collaborating-with-your-team/index.md index 942aeea7edb4..c6902b924b36 100644 --- a/content/organizations/collaborating-with-your-team/index.md +++ b/content/organizations/collaborating-with-your-team/index.md @@ -17,6 +17,4 @@ children: shortTitle: Collaborate with your team --- -{% ifversion team-discussions-migration %} {% data reusables.organizations.team-discussions-migration %} -{% endif %} diff --git a/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md index ea27163083c6..4f60ebff3afc 100644 --- a/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md @@ -11,9 +11,7 @@ topics: - Community --- -{% ifversion team-discussions-migration %} {% data reusables.organizations.team-discussions-migration %} -{% endif %} {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} diff --git a/content/organizations/organizing-members-into-teams/about-teams.md b/content/organizations/organizing-members-into-teams/about-teams.md index 96393171ed05..43d312fa94cd 100644 --- a/content/organizations/organizing-members-into-teams/about-teams.md +++ b/content/organizations/organizing-members-into-teams/about-teams.md @@ -17,7 +17,7 @@ topics: You can use teams to manage access for people in an organization, and for sending notifications. Organization owners and team maintainers can give teams admin, read, or write access to organization repositories. Organization members can send a notification to an entire team by mentioning the team's name. Teams can only be made up of members of your organization, outside collaborators are unable to be on a team. -{% ifversion team-mentions-setting %}Organization owners and team maintainers can disable team notifications. For more information, see [AUTOTITLE](/organizations/organizing-members-into-teams/configuring-team-notifications).{% endif %} +Organization owners and team maintainers can disable team notifications. For more information, see [AUTOTITLE](/organizations/organizing-members-into-teams/configuring-team-notifications). Organization members can also send a notification to an entire team by requesting a review from that team. Organization members can request reviews from specific teams with read access to the repository where the pull request is opened. Teams can be designated as owners of certain types or areas of code in a CODEOWNERS file. diff --git a/content/organizations/organizing-members-into-teams/configuring-team-notifications.md b/content/organizations/organizing-members-into-teams/configuring-team-notifications.md index c4eaf67cd269..67fcdb27eecb 100644 --- a/content/organizations/organizing-members-into-teams/configuring-team-notifications.md +++ b/content/organizations/organizing-members-into-teams/configuring-team-notifications.md @@ -2,7 +2,9 @@ title: Configuring team notifications intro: 'Team maintainers and organization owners can configure notifications for specific teams.' versions: - feature: team-mentions-setting + fpt: '*' + ghes: '*' + ghec: '*' topics: - Organizations - Teams diff --git a/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md index aea531034f94..f2cae313bf1b 100644 --- a/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md +++ b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md @@ -12,9 +12,7 @@ topics: shortTitle: Disable team discussions --- -{% ifversion team-discussions-migration %} {% data reusables.organizations.team-discussions-migration %} -{% endif %} {% data reusables.organizations.team-discussions-default %} For more information on team discussions, see [AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions). diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md index 38d408a4873b..bed2b269b7a2 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md @@ -22,19 +22,11 @@ permissions: People with write access for a forked repository can sync the fork ## Syncing a fork branch from the web UI -{% ifversion syncing-fork-web-ui %} 1. On {% data variables.product.github %}, navigate to the main page of the forked repository that you want to sync with the upstream repository. 1. Above the list of files, select the **Sync fork** dropdown menu. ![Screenshot of the main page of a fork. A dropdown menu, labeled with a sync icon and "Sync fork," is outlined in dark orange.](/assets/images/help/repository/sync-fork-dropdown.png) 1. Review the details about the commits from the upstream repository, then click **Update branch**. -{% else %} -1. On {% data variables.product.github %}, navigate to the main page of the forked repository that you want to sync with the upstream repository. -1. Above the list of files, select the **Fetch upstream** dropdown menu. - - ![Screenshot of the main page of a fork. A dropdown menu, labeled with a sync icon and "Fetch upstream," is outlined in dark orange.](/assets/images/help/repository/fetch-upstream-drop-down.png) -1. Review the details about the commits from the upstream repository, then click **Fetch and merge**. -{% endif %} If the changes from the upstream repository cause conflicts, {% data variables.product.company_short %} will prompt you to create a pull request to resolve the conflicts. diff --git a/data/reusables/actions/about-runner-groups.md b/data/reusables/actions/about-runner-groups.md index 69ebf31dba63..abb7c48e3b32 100644 --- a/data/reusables/actions/about-runner-groups.md +++ b/data/reusables/actions/about-runner-groups.md @@ -4,6 +4,4 @@ When you grant access to a runner group, you can see the runner group listed in When new runners are created, they are automatically assigned to the default group unless otherwise specified. Runners can only be in one group at a time. You can move runners from one runner group to another. For more information, see [Moving a runner to a group](#moving-a-runner-to-a-group). -{% ifversion target-runner-groups %} For information on how to route jobs to runners in a specific group, see [AUTOTITLE](/actions/using-jobs/choosing-the-runner-for-a-job#choosing-runners-in-a-group). -{% endif %} diff --git a/data/reusables/actions/jobs/choosing-runner-overview.md b/data/reusables/actions/jobs/choosing-runner-overview.md index c0914974bfe5..c6edd4ffe61e 100644 --- a/data/reusables/actions/jobs/choosing-runner-overview.md +++ b/data/reusables/actions/jobs/choosing-runner-overview.md @@ -2,8 +2,7 @@ Use `jobs..runs-on` to define the type of machine to run the job on. {% ifversion fpt or ghec %}- The destination machine can be either a [{% data variables.product.prodname_dotcom %}-hosted runner](#choosing-github-hosted-runners), [{% data variables.actions.hosted_runner %}](#choosing-runners-in-a-group), or a [self-hosted runner](#choosing-self-hosted-runners).{% else %} * The destination machine can be a [self-hosted runner](#choosing-self-hosted-runners).{% endif %} -{% ifversion target-runner-groups %}- You can target runners based on the labels assigned to them, or their group membership, or a combination of these.{% else %} -* You can target runners based on the labels assigned to them.{% endif %} +* You can target runners based on the labels assigned to them, or their group membership, or a combination of these. * You can provide `runs-on` as: * A single string * A single variable containing a string diff --git a/data/reusables/actions/section-using-unique-names-for-runner-groups.md b/data/reusables/actions/section-using-unique-names-for-runner-groups.md index b26972cdd73e..763d61bfea6f 100644 --- a/data/reusables/actions/section-using-unique-names-for-runner-groups.md +++ b/data/reusables/actions/section-using-unique-names-for-runner-groups.md @@ -1,5 +1,5 @@ -{% ifversion target-runner-groups %}{% ifversion ghec or ghes %} +{% ifversion ghec or ghes %} ## Using unique names for runner groups @@ -15,5 +15,3 @@ To avoid ambiguity, a workflow will fail if there are duplicate runner groups in {% data reusables.actions.using-prefixes-to-differentiate-runner-groups %} {% endif %} - -{% endif %} diff --git a/data/reusables/audit_log/audit-log-search-list-info-about-action.md b/data/reusables/audit_log/audit-log-search-list-info-about-action.md index 6623d67018d6..e1e0d3af07eb 100644 --- a/data/reusables/audit_log/audit-log-search-list-info-about-action.md +++ b/data/reusables/audit_log/audit-log-search-list-info-about-action.md @@ -12,7 +12,7 @@ Each audit log entry shows applicable information about an event, such as: {%- ifversion ghec or ghes > 3.12 %} * The SAML SSO and SCIM identity of the user (actor) who performed the action {%- endif %} -{%- ifversion token-audit-log %} +{%- ifversion ghec or ghes %} * For actions outside of the web UI, how the user (actor) authenticated {%- endif %} {%- ifversion enterprise-audit-log-ip-addresses %} From a76f3595edf12cf342679ee1d984cf6ceb14b6cd Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:48:41 +0000 Subject: [PATCH 5/5] Hack week 2025: remove unneeded FBV instances (18) - Packages & PATs (#54010) --- .../re-running-workflows-and-jobs.md | 4 ---- .../sharing-automations/reusing-workflows.md | 4 ---- ...rsonal-access-tokens-in-your-enterprise.md | 7 +++--- ...onal-access-tokens-in-your-organization.md | 4 ---- ...onal-access-tokens-in-your-organization.md | 4 ---- .../deleting-and-restoring-a-package.md | 6 +---- .../introduction-to-github-packages.md | 2 +- ...ainer-registry-from-the-docker-registry.md | 4 ---- ...sing-custom-workflows-with-github-pages.md | 24 +++++-------------- .../accounts/create-personal-access-tokens.md | 2 +- .../command_line/provide-an-access-token.md | 2 +- .../packages-classic-pat-only.md | 4 ---- data/reusables/pages/admin-must-push.md | 2 +- data/reusables/pages/new-or-existing-repo.md | 2 +- .../pages/pages-about-publishing-source.md | 8 ------- data/reusables/pages/test-locally.md | 2 +- .../classic-projects-api-classic-pat-only.md | 4 ---- .../enterprise-admin-api-classic-pat-only.md | 6 +---- .../imports-api-classic-pat-only.md | 4 ---- .../notifications-api-classic-pat-only.md | 4 ---- 20 files changed, 18 insertions(+), 81 deletions(-) diff --git a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md index 75ccfce64f73..26865a478f4e 100644 --- a/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md +++ b/content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md @@ -123,14 +123,10 @@ gh run rerun --job JOB_ID --debug {% endcli %} -{% ifversion partial-reruns-with-reusable %} - ## Re-running workflows and jobs with reusable workflows {% data reusables.actions.partial-reruns-with-reusable %} -{% endif %} - ## Reviewing previous workflow runs You can view the results from your previous attempts at running a workflow. You can also view previous workflow runs using the API. For more information, see [AUTOTITLE](/rest/actions/workflow-runs#get-a-workflow-run). diff --git a/content/actions/sharing-automations/reusing-workflows.md b/content/actions/sharing-automations/reusing-workflows.md index 51bcf900f667..a99b4118dd7a 100644 --- a/content/actions/sharing-automations/reusing-workflows.md +++ b/content/actions/sharing-automations/reusing-workflows.md @@ -430,14 +430,10 @@ For information about using the REST API to query the audit log for an organizat > [!NOTE] > Audit data for `prepared_workflow_job` can only be viewed using the REST API. It is not visible in the {% data variables.product.prodname_dotcom %} web interface, or included in JSON/CSV exported audit data. -{% ifversion partial-reruns-with-reusable %} - ## Re-running workflows and jobs with reusable workflows {% data reusables.actions.partial-reruns-with-reusable %} -{% endif %} - ## Next steps To continue learning about {% data variables.product.prodname_actions %}, see [AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows). diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md index 5e42d08fdba3..68c73b213cbb 100644 --- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md +++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md @@ -2,16 +2,17 @@ title: Enforcing policies for personal access tokens in your enterprise intro: 'Enterprise owners can control access to resources by applying policies to {% data variables.product.pat_generic_plural %}' versions: - feature: pat-v2-enterprise + ghec: '*' + ghes: '*' shortTitle: '{% data variables.product.pat_generic_caps %} policies' redirect_from: - /admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise --- > [!NOTE] -> {% data reusables.user-settings.pat-v2-beta %} +> {% data reusables.user-settings.pat-v2-beta %} > -> During the {% data variables.release-phases.public_preview %}, enterprises must opt in to {% data variables.product.pat_v2_plural %}. If your enterprise has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below. +> During the {% data variables.release-phases.public_preview %}, enterprises must opt in to {% data variables.product.pat_v2_plural %}. If your enterprise has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below. > > Organizations within an enterprise can opt in to {% data variables.product.pat_v2_plural %}, even if the enterprise has not. All users, including {% data variables.product.prodname_emus %}, can create {% data variables.product.pat_v2_plural %} that can access resources owned by the user (such as repositories created under their account) regardless of the enterprise's opt in status. diff --git a/content/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization.md b/content/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization.md index be5dd50e049c..d376232071b2 100644 --- a/content/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization.md +++ b/content/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization.md @@ -19,12 +19,8 @@ When organization members create a {% data variables.product.pat_v2 %} to access > [!NOTE] > Only {% data variables.product.pat_v2 %}s, not {% data variables.product.pat_v1_plural %}, are subject to approval. Unless the organization has restricted access by {% data variables.product.pat_v1_plural %}, any {% data variables.product.pat_v1 %} can access organization resources without prior approval. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization). -{% ifversion pat-v2-org-admin-api %} - Organization owners can also use the REST API to review and manage {% data variables.product.pat_v2 %} requests. These endpoints can only be called by {% data variables.product.prodname_github_apps %}, and cannot be called with {% data variables.product.pat_generic_plural %} or {% data variables.product.prodname_oauth_apps %}. For more information, see [AUTOTITLE](/rest/orgs/orgs#list-requests-to-access-organization-resources-with-fine-grained-personal-access-tokens). -{% endif %} - ## Managing {% data variables.product.pat_v2 %} requests {% data reusables.profile.access_org %} diff --git a/content/organizations/managing-programmatic-access-to-your-organization/reviewing-and-revoking-personal-access-tokens-in-your-organization.md b/content/organizations/managing-programmatic-access-to-your-organization/reviewing-and-revoking-personal-access-tokens-in-your-organization.md index 39ea968a4187..d935c30153e1 100644 --- a/content/organizations/managing-programmatic-access-to-your-organization/reviewing-and-revoking-personal-access-tokens-in-your-organization.md +++ b/content/organizations/managing-programmatic-access-to-your-organization/reviewing-and-revoking-personal-access-tokens-in-your-organization.md @@ -20,12 +20,8 @@ Organization owners can only view and revoke {% data variables.product.pat_v2 %} {% ifversion ghec %} Organization owners can also view and revoke {% data variables.product.pat_v1_plural %} if their organization requires SAML single-sign on. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise#viewing-and-revoking-authorized-credentials). For more information about using the REST API to do this, see [List SAML SSO authorizations for an organization](/rest/orgs/orgs#list-saml-sso-authorizations-for-an-organization) and [Remove a SAML SSO authorization for an organization](/rest/orgs/orgs#remove-a-saml-sso-authorization-for-an-organization).{% endif %} -{% ifversion pat-v2-org-admin-api %} - Organization owners can also use the REST API to review and revoke {% data variables.product.pat_v2 %}s. These endpoints can only be called by {% data variables.product.prodname_github_apps %}, and cannot be called with {% data variables.product.pat_generic_plural %} or {% data variables.product.prodname_oauth_apps %}. For more information, see [AUTOTITLE](/rest/orgs/orgs#list-fine-grained-personal-access-tokens-with-access-to-organization-resources). -{% endif %} - ## Reviewing and revoking {% data variables.product.pat_v2 %}s {% data reusables.profile.access_org %} diff --git a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md index 9cc8d0726299..032ed0fdb250 100644 --- a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md +++ b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md @@ -36,16 +36,12 @@ On {% data variables.product.prodname_dotcom %}, you can also restore an entire {% data reusables.package_registry.packages-classic-pat-only %} -{% ifversion packages-rest-api %} - You can use the REST API to manage your packages. For more information, see the [AUTOTITLE](/rest/packages). {% data reusables.package_registry.delete-with-github-token-using-api-beta %} With registries that support granular permissions, you can use a `GITHUB_TOKEN` in a {% data variables.product.prodname_actions %} workflow to delete or restore packages using the REST API. The token must have `admin` permission to the package. If your workflow publishes a package, the `admin` role is granted by default to the repository where the workflow is stored. For existing packages not published by a workflow, you need to grant the repository the `admin` role to be able to use a {% data variables.product.prodname_actions %} workflow to delete or restore packages using the REST API. For more information, see [AUTOTITLE](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility#ensuring-workflow-access-to-your-package). -{% endif %} - {% data reusables.package_registry.about-graphql-support %} ## Required permissions to delete or restore a package @@ -73,7 +69,7 @@ To delete a version of a repository-scoped package, you must have admin permissi ### Deleting a version of a repository-scoped package with GraphQL -{% data reusables.package_registry.about-graphql-support %}{% ifversion packages-rest-api %} For information on using the REST API instead, see the [AUTOTITLE](/rest/packages).{% endif %} +{% data reusables.package_registry.about-graphql-support %} For information on using the REST API instead, see the [AUTOTITLE](/rest/packages). Use the `deletePackageVersion` mutation in the GraphQL API. You must use a {% data variables.product.pat_v1 %} with the `read:packages`, `delete:packages`, and `repo` scopes. For more information about {% data variables.product.pat_v1_plural %}, see [AUTOTITLE](/packages/learn-github-packages/introduction-to-github-packages#authenticating-to-github-packages). diff --git a/content/packages/learn-github-packages/introduction-to-github-packages.md b/content/packages/learn-github-packages/introduction-to-github-packages.md index 8e0b9ce5893d..40e8068e408e 100644 --- a/content/packages/learn-github-packages/introduction-to-github-packages.md +++ b/content/packages/learn-github-packages/introduction-to-github-packages.md @@ -95,7 +95,7 @@ For more information about Docker and the {% data variables.product.prodname_con ## Managing packages -You can delete a package in the {% data variables.product.product_name %} user interface{% ifversion packages-rest-api %} or using the REST API. For more information, see [AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package) and the [AUTOTITLE](/rest/packages).{% else %}.{% endif %} {% data reusables.package_registry.about-graphql-support %} +You can delete a package in the {% data variables.product.product_name %} user interface or using the REST API. For more information, see [AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package) and the [AUTOTITLE](/rest/packages). {% data reusables.package_registry.about-graphql-support %} When you use the GraphQL API to query and delete private packages, you must use the same {% data variables.product.pat_v1 %} you use to authenticate to {% data variables.product.prodname_registry %}. diff --git a/content/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry.md b/content/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry.md index 9c277f2eef4f..ea486774569d 100644 --- a/content/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry.md +++ b/content/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry.md @@ -41,12 +41,8 @@ After a Docker image has been migrated to the {% data variables.product.prodname {% data reusables.package_registry.container-registry-migration-namespaces %} -{% ifversion packages-rest-api %} - After migration, you'll no longer be able to use the GraphQL API to query for packages with a `PackageType` of "DOCKER". Instead, you can use the REST API to query for packages with a `package_type` of "container". For more information, see [AUTOTITLE](/rest/packages). -{% endif %} - {% ifversion fpt or ghec %} ## About billing for {% data variables.product.prodname_container_registry %} diff --git a/content/pages/getting-started-with-github-pages/using-custom-workflows-with-github-pages.md b/content/pages/getting-started-with-github-pages/using-custom-workflows-with-github-pages.md index edb39dd48467..7e62c50ff5d6 100644 --- a/content/pages/getting-started-with-github-pages/using-custom-workflows-with-github-pages.md +++ b/content/pages/getting-started-with-github-pages/using-custom-workflows-with-github-pages.md @@ -38,10 +38,8 @@ To use the action in your current workflow place this snippet under `jobs`. - name: Upload GitHub Pages artifact {%- ifversion fpt or ghec %} uses: actions/upload-pages-artifact@v3 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/upload-pages-artifact@v2 -{%- else %} - uses: actions/upload-pages-artifact@v1 {%- endif %} ``` @@ -75,10 +73,8 @@ jobs: id: deployment {%- ifversion fpt or ghec %} uses: actions/deploy-pages@v4 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/deploy-pages@v3 -{%- else %} - uses: actions/deploy-pages@v1 {%- endif %} # ... ``` @@ -108,10 +104,8 @@ jobs: - name: Upload artifact {%- ifversion fpt or ghec %} uses: actions/upload-pages-artifact@v3 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/upload-pages-artifact@v2 -{%- else %} - uses: actions/upload-pages-artifact@v1 {%- endif %} # Deployment job @@ -126,10 +120,8 @@ jobs: id: deployment {%- ifversion fpt or ghec %} uses: actions/deploy-pages@v4 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/deploy-pages@v3 -{%- else %} - uses: actions/deploy-pages@v1 {%- endif %} # ... ``` @@ -154,10 +146,8 @@ jobs: - name: Upload Artifact {%- ifversion fpt or ghec %} uses: actions/upload-pages-artifact@v3 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/upload-pages-artifact@v2 -{%- else %} - uses: actions/upload-pages-artifact@v1 {%- endif %} with: # upload entire directory @@ -166,10 +156,8 @@ jobs: id: deployment {%- ifversion fpt or ghec %} uses: actions/deploy-pages@v4 -{%- elsif pages-custom-workflow-ghes3-9 %} +{%- elsif ghes %} uses: actions/deploy-pages@v3 -{%- else %} - uses: actions/deploy-pages@v1 {%- endif %} # ... diff --git a/data/reusables/accounts/create-personal-access-tokens.md b/data/reusables/accounts/create-personal-access-tokens.md index 2c556616b31f..c21e7a394197 100644 --- a/data/reusables/accounts/create-personal-access-tokens.md +++ b/data/reusables/accounts/create-personal-access-tokens.md @@ -1 +1 @@ -1. For each of your accounts, create a dedicated {% data variables.product.pat_v1 %} with `repo` scope. {% ifversion pat-v2 %}Or, for each of your accounts and for each organization that you are a member of, create a {% data variables.product.pat_v2 %} that can access the desired repositories and that has read and write permissions on repository contents.{% endif %} For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). +1. For each of your accounts, create a dedicated {% data variables.product.pat_v1 %} with `repo` scope. Or, for each of your accounts and for each organization that you are a member of, create a {% data variables.product.pat_v2 %} that can access the desired repositories and that has read and write permissions on repository contents. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). diff --git a/data/reusables/command_line/provide-an-access-token.md b/data/reusables/command_line/provide-an-access-token.md index 05758d334a19..6b0d2b16b0f7 100644 --- a/data/reusables/command_line/provide-an-access-token.md +++ b/data/reusables/command_line/provide-an-access-token.md @@ -1 +1 @@ -{% ifversion fpt or ghec %}If you are accessing an organization that uses SAML SSO{% ifversion pat-v2 %} and you are using a {% data variables.product.pat_v1 %}{% endif %}, you must also authorize your {% data variables.product.pat_generic %} to access the organization before you authenticate. For more information, see [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on) and [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %} +{% ifversion fpt or ghec %}If you are accessing an organization that uses SAML SSO and you are using a {% data variables.product.pat_v1 %}, you must also authorize your {% data variables.product.pat_generic %} to access the organization before you authenticate. For more information, see [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on) and [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %} diff --git a/data/reusables/package_registry/packages-classic-pat-only.md b/data/reusables/package_registry/packages-classic-pat-only.md index 3fa22af6516a..53b02a4ef816 100644 --- a/data/reusables/package_registry/packages-classic-pat-only.md +++ b/data/reusables/package_registry/packages-classic-pat-only.md @@ -1,6 +1,2 @@ -{% ifversion pat-v2 %} - > [!NOTE] > {% data variables.product.prodname_registry %} only supports authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). - -{% endif %} diff --git a/data/reusables/pages/admin-must-push.md b/data/reusables/pages/admin-must-push.md index 0c35977f1043..ff8623b2d51c 100644 --- a/data/reusables/pages/admin-must-push.md +++ b/data/reusables/pages/admin-must-push.md @@ -1,3 +1,3 @@ > [!NOTE] -> * {% ifversion pages-custom-workflow %}If you are publishing from a branch and{% else %}If{% endif %} your site has not published automatically, make sure someone with admin permissions and a verified email address has pushed to the publishing source. +> * If you are publishing from a branch and your site has not published automatically, make sure someone with admin permissions and a verified email address has pushed to the publishing source. > * {% data reusables.actions.actions-do-not-trigger-pages-rebuilds %} diff --git a/data/reusables/pages/new-or-existing-repo.md b/data/reusables/pages/new-or-existing-repo.md index 6c8efe1be81a..8b1c0dd124e1 100644 --- a/data/reusables/pages/new-or-existing-repo.md +++ b/data/reusables/pages/new-or-existing-repo.md @@ -1,6 +1,6 @@ You can either create a repository or choose an existing repository for your site. -If you want to create a {% data variables.product.prodname_pages %} site for a repository where not all of the files in the repository are related to the site, you will be able to configure a publishing source for your site. For example, you can have a dedicated branch and folder to hold your site source {% ifversion pages-custom-workflow %}files, or you can use a custom {% data variables.product.prodname_actions %} workflow to build and deploy your site source files. {% data reusables.actions.settings-ui.settings-actions-pages-custom-workflow %}{% else %}files.{% endif %} +If you want to create a {% data variables.product.prodname_pages %} site for a repository where not all of the files in the repository are related to the site, you will be able to configure a publishing source for your site. For example, you can have a dedicated branch and folder to hold your site source files, or you can use a custom {% data variables.product.prodname_actions %} workflow to build and deploy your site source files. {% data reusables.actions.settings-ui.settings-actions-pages-custom-workflow %} {% ifversion fpt or ghec %}If the account that owns the repository uses {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_free_team %} for organizations, the repository must be public.{% endif %} diff --git a/data/reusables/pages/pages-about-publishing-source.md b/data/reusables/pages/pages-about-publishing-source.md index 8296f9c31eaa..6fc78aa11f73 100644 --- a/data/reusables/pages/pages-about-publishing-source.md +++ b/data/reusables/pages/pages-about-publishing-source.md @@ -1,13 +1,5 @@ -{% ifversion pages-custom-workflow %} - You can publish your site when changes are pushed to a specific branch, or you can write a {% data variables.product.prodname_actions %} workflow to publish your site. {% data reusables.actions.settings-ui.settings-actions-pages-custom-workflow %} If you do not need any control over the build process for your site, we recommend that you publish your site when changes are pushed to a specific branch. {% data reusables.pages.pages-about-branch-source %} If you want to use a build process other than Jekyll or you do not want a dedicated branch to hold your compiled static files, we recommend that you write a {% data variables.product.prodname_actions %} workflow to publish your site. {% data variables.product.product_name %} provides workflow templates for common publishing scenarios to help you write your workflow. - -{% else %} - -Your {% data variables.product.prodname_pages %} site will publish whenever changes are pushed to a specific branch. {% data reusables.pages.pages-about-branch-source %} - -{% endif %} diff --git a/data/reusables/pages/test-locally.md b/data/reusables/pages/test-locally.md index f1134911ab5a..dc5eae6a5dcf 100644 --- a/data/reusables/pages/test-locally.md +++ b/data/reusables/pages/test-locally.md @@ -1 +1 @@ -{% ifversion pages-custom-workflow %}If you are publishing from a branch, changes{% else %}Changes{% endif %} to your site are published automatically when the changes are merged into your site's publishing source. {% ifversion pages-custom-workflow %}If you are publishing from a custom {% data variables.product.prodname_actions %} workflow, changes are published whenever your workflow is triggered (typically by a push to the default branch). {% endif %}If you want to preview your changes first, you can make the changes locally instead of on {% data variables.product.product_name %}. Then, test your site locally. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll). +If you are publishing from a branch, changes to your site are published automatically when the changes are merged into your site's publishing source. If you are publishing from a custom {% data variables.product.prodname_actions %} workflow, changes are published whenever your workflow is triggered (typically by a push to the default branch). If you want to preview your changes first, you can make the changes locally instead of on {% data variables.product.product_name %}. Then, test your site locally. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll). diff --git a/data/reusables/user-settings/classic-projects-api-classic-pat-only.md b/data/reusables/user-settings/classic-projects-api-classic-pat-only.md index c9d11d54a492..8f9231cf68e8 100644 --- a/data/reusables/user-settings/classic-projects-api-classic-pat-only.md +++ b/data/reusables/user-settings/classic-projects-api-classic-pat-only.md @@ -1,6 +1,2 @@ -{% ifversion pat-v2 %} - > [!NOTE] > The REST API to manage {% data variables.product.prodname_projects_v1 %} only supports authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). - -{% endif %} diff --git a/data/reusables/user-settings/enterprise-admin-api-classic-pat-only.md b/data/reusables/user-settings/enterprise-admin-api-classic-pat-only.md index d5617f1c1a21..ef3f11eef082 100644 --- a/data/reusables/user-settings/enterprise-admin-api-classic-pat-only.md +++ b/data/reusables/user-settings/enterprise-admin-api-classic-pat-only.md @@ -1,6 +1,2 @@ -{% ifversion pat-v2 %} - > [!NOTE] -> These endpoints only support authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). - -{% endif %} +> These endpoints only support authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic). diff --git a/data/reusables/user-settings/imports-api-classic-pat-only.md b/data/reusables/user-settings/imports-api-classic-pat-only.md index d5617f1c1a21..1f2febf223f3 100644 --- a/data/reusables/user-settings/imports-api-classic-pat-only.md +++ b/data/reusables/user-settings/imports-api-classic-pat-only.md @@ -1,6 +1,2 @@ -{% ifversion pat-v2 %} - > [!NOTE] > These endpoints only support authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). - -{% endif %} diff --git a/data/reusables/user-settings/notifications-api-classic-pat-only.md b/data/reusables/user-settings/notifications-api-classic-pat-only.md index d5617f1c1a21..1f2febf223f3 100644 --- a/data/reusables/user-settings/notifications-api-classic-pat-only.md +++ b/data/reusables/user-settings/notifications-api-classic-pat-only.md @@ -1,6 +1,2 @@ -{% ifversion pat-v2 %} - > [!NOTE] > These endpoints only support authentication using a {% data variables.product.pat_v1 %}. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). - -{% endif %}