From 672c76ffeea42b96fd35f1a4acebb5b899619765 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 26 Jun 2024 07:09:01 -0400 Subject: [PATCH 1/6] Fix use of Liquid ifversion in Markdown tables (8) (#51397) --- .../creating-a-pre-receive-hook-script.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/content/admin/enforcing-policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md b/content/admin/enforcing-policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md index 0ec98405291a..8cd61a1815fb 100644 --- a/content/admin/enforcing-policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md +++ b/content/admin/enforcing-policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md @@ -72,8 +72,8 @@ The following variables are always available in the pre-receive hook environment | :- | :- | :- | |
$GIT_DIR
| Path to the remote repository on the instance | /data/user/repositories/a/ab/
a1/b2/34/100001234/1234.git | |
$GIT_PUSH_OPTION_COUNT
| The number of push options that were sent by the client with `--push-option`. For more information, see "[git-push](https://git-scm.com/docs/git-push#Documentation/git-push.txt---push-optionltoptiongt)" in the Git documentation. | 1 | -|
$GIT\_PUSH\_OPTION\_N
| Where N is an integer starting at 0, this variable contains the push option string that was sent by the client. The first option that was sent is stored in `GIT_PUSH_OPTION_0`, the second option that was sent is stored in `GIT_PUSH_OPTION_1`, and so on. For more information about push options, see "[git-push](https://git-scm.com/docs/git-push#git-push---push-optionltoptiongt)" in the Git documentation. | abcd |{% ifversion ghes %} -|
$GIT_USER_AGENT
| User-agent string sent by the Git client that pushed the changes | git/2.0.0{% endif %} +|
$GIT\_PUSH\_OPTION\_N
| Where N is an integer starting at 0, this variable contains the push option string that was sent by the client. The first option that was sent is stored in `GIT_PUSH_OPTION_0`, the second option that was sent is stored in `GIT_PUSH_OPTION_1`, and so on. For more information about push options, see "[git-push](https://git-scm.com/docs/git-push#git-push---push-optionltoptiongt)" in the Git documentation. | abcd | +|
$GIT_USER_AGENT
| User-agent string sent by the Git client that pushed the changes | git/2.0.0 | |
$GITHUB_REPO_NAME
| Name of the repository being updated in NAME/OWNER format | octo-org/hello-enterprise | |
$GITHUB_REPO_PUBLIC
| Boolean representing whether the repository being updated is public | |
$GITHUB_USER_IP
| IP address of client that initiated the push | 192.0.2.1 | @@ -93,9 +93,7 @@ The `$GITHUB_VIA` variable is available in the pre-receive hook environment when |
git refs delete api
| Deletion of a ref via the API | "[AUTOTITLE](/rest/git/refs#delete-a-reference)" | |
git refs update api
| Update of a ref via the API | "[AUTOTITLE](/rest/git/refs#update-a-reference)" | |
git repo contents api
| Change to a file's contents via the API | "[AUTOTITLE](/rest/repos/contents#create-or-update-file-contents)" | -{%- ifversion ghes %} | `merge` | Merge of a pull request using auto-merge | "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)" | -{%- endif %} |
merge base into head
| Update of the topic branch from the base branch when the base branch requires strict status checks (via **Update branch** in a pull request, for example) | "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches#require-status-checks-before-merging)" | |
pull request branch delete button
| Deletion of a topic branch from a pull request in the web interface | "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request#deleting-a-branch-used-for-a-pull-request)" | |
pull request branch undo button
| Restoration of a topic branch from a pull request in the web interface | "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request#restoring-a-deleted-branch)" | @@ -107,7 +105,7 @@ The `$GITHUB_VIA` variable is available in the pre-receive hook environment when |
tag create api
| Creation of a tag via the API | "[AUTOTITLE](/rest/git/tags#create-a-tag-object)" | {%- ifversion ghes < 3.13 %} |
slumlord (#SHA)
| Commit via Subversion | "[AUTOTITLE](/get-started/working-with-subversion-on-github/support-for-subversion-clients#making-commits-to-subversion)" | -{%- endif %} +| {% endif %} | |
web branch create
| Creation of a branch via the web interface | "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository#creating-a-branch)" | #### Available for pull request merges From a06fe8ef4d98fc2ea069fd57f53055ada37f22be Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 26 Jun 2024 07:09:11 -0400 Subject: [PATCH 2/6] Remove ifversion 'dependabot-version-updates-for-forks' feature (#51389) --- .../configuring-dependabot-version-updates.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/content/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates.md b/content/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates.md index 241d75bc7d79..c03f93532ec0 100644 --- a/content/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates.md +++ b/content/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates.md @@ -107,23 +107,11 @@ If you want to enable version updates on forks, there's an extra step. Version u On a fork, you also need to explicitly enable {% data variables.product.prodname_dependabot %}. -{% ifversion dependabot-version-updates-for-forks %} - {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.navigate-to-code-security-and-analysis %} 1. Under "Code security and analysis", to the right of "{% data variables.product.prodname_dependabot_version_updates %}", click **Enable** to allow {% data variables.product.prodname_dependabot %} to initiate version updates. -{% else %} - -{% data reusables.repositories.navigate-to-repo %} -{% data reusables.repositories.accessing-repository-graphs %} -{% data reusables.repositories.click-dependency-graph %} -{% data reusables.dependabot.click-dependabot-tab %} -1. Under "Enable Dependabot", click **Enable Dependabot**. - -{% endif %} - ## Checking the status of version updates After you enable version updates, the **Dependabot** tab in the dependency graph for the repository is populated. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot %} last checked for new versions. From 752f293385949fa64f510e0cbb1f2831f9330ad5 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 26 Jun 2024 07:09:20 -0400 Subject: [PATCH 3/6] Remove ifversion 'dependabot-bulk-alerts' feature (#51390) --- .../viewing-and-updating-dependabot-alerts.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md index 39bba4a19e92..326ffa24fa75 100644 --- a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md +++ b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md @@ -24,7 +24,7 @@ topics: {% data reusables.dependabot.enterprise-enable-dependabot %} -Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can filter alerts by package, ecosystem, or manifest. You can sort the list of alerts, and you can click into specific alerts for more details. {% ifversion dependabot-bulk-alerts %}You can also dismiss or reopen alerts, either one by one or by selecting multiple alerts at once.{% else %}You can also dismiss or reopen alerts. {% endif %} For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)." +Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can filter alerts by package, ecosystem, or manifest. You can sort the list of alerts, and you can click into specific alerts for more details. You can also dismiss or reopen alerts, either one by one or by selecting multiple alerts at once. For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)." You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates)." @@ -55,9 +55,7 @@ The search bar also allows for full text searching of alerts and related securit {% endif %} -{% ifversion dependabot-bulk-alerts %} ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab.](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png) -{% endif %} {% ifversion dependabot-alerts-development-label %} @@ -117,8 +115,7 @@ For more information, see "[Reviewing and fixing alerts](#reviewing-and-fixing-a {% data reusables.repositories.sidebar-dependabot-alerts %} 1. Optionally, to filter alerts, select a filter in a dropdown menu then click the filter that you would like to apply. You can also type filters into the search bar. {% ifversion dependabot-filter-label-security-advisory %}Alternatively, to filter by label, click a label assigned to an alert to automatically apply that filter to the alert list.{% endif %} For more information about filtering and sorting alerts, see "[Prioritizing {% data variables.product.prodname_dependabot_alerts %}](#prioritizing-dependabot-alerts)." -{%- ifversion dependabot-bulk-alerts %} - ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab.](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png){% endif %} + ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab.](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png) 1. Click the alert that you would like to view. {% ifversion dependabot-filter-label-security-advisory %} 1. Optionally, to suggest an improvement to the related security advisory, on the right-hand side of the alert details page, click **Suggest improvements for this advisory on the {% data variables.product.prodname_advisory_database %}**. For more information, see "[AUTOTITLE](/code-security/security-advisories/working-with-global-security-advisories-from-the-github-advisory-database/editing-security-advisories-in-the-github-advisory-database)." @@ -171,7 +168,6 @@ If you schedule extensive work to upgrade a dependency, or decide that an alert {% else %} ![Screenshot of the page for a Dependabot alert, with the "Dismiss" dropdown and its options highlighted with a dark orange outline.](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png){% endif %} -{% ifversion dependabot-bulk-alerts %} ### Dismissing multiple alerts at once @@ -184,8 +180,6 @@ If you schedule extensive work to upgrade a dependency, or decide that an alert 1. Select the "Dismiss alerts" dropdown, and click a reason for dismissing the alerts. ![Screenshot of a list of alerts. Below the "Dismiss alerts" button, a dropdown labeled "Select a reason to dismiss" is expanded. The dropdown contains radio buttons for various options.](/assets/images/help/graphs/dismiss-multiple-alerts.png) -{% endif %} - {% ifversion reopen-dependabot-alerts %} ## Viewing and updating closed alerts @@ -197,9 +191,7 @@ You can view all open alerts, and you can reopen alerts that have been previousl {% data reusables.repositories.sidebar-dependabot-alerts %} 1. To just view closed alerts, click **Closed**. - {%- ifversion dependabot-bulk-alerts %} ![Screenshot showing the list of {% data variables.product.prodname_dependabot_alerts %} with the "Closed" tab highlighted with a dark orange outline.](/assets/images/help/repository/dependabot-alerts-closed-checkbox.png) - {%- endif %} 1. Click the alert that you would like to view or update. 1. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**. Alerts that have already been fixed cannot be reopened. @@ -208,8 +200,6 @@ You can view all open alerts, and you can reopen alerts that have been previousl {% endif %} -{% ifversion dependabot-bulk-alerts %} - ### Reopening multiple alerts at once 1. View the closed {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[AUTOTITLE](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts#viewing-and-updating-closed-alerts)" (above). @@ -218,8 +208,6 @@ You can view all open alerts, and you can reopen alerts that have been previousl ![Screenshot of alerts in the "Closed" tab. The "Select all" checkbox is highlighted with a dark orange outline.](/assets/images/help/graphs/select-all-closed-alerts.png) 1. Click **Reopen** to reopen the alerts. Alerts that have already been fixed cannot be reopened. -{% endif %} - ## Reviewing the audit logs for {% data variables.product.prodname_dependabot_alerts %} When a member of your organization {% ifversion not fpt %}or enterprise {% endif %}performs an action related to {% data variables.product.prodname_dependabot_alerts %}, you can review the actions in the audit log. For more information about accessing the log, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization#accessing-the-audit-log){% ifversion not fpt %}" and "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise)."{% else %}."{% endif %} From ab90ef6099b6db2e456f7b1dc2e8f54d7f5acf8b Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 26 Jun 2024 07:09:30 -0400 Subject: [PATCH 4/6] Remove ifversion 'projects-v2-roadmaps' feature (#51368) --- .../changing-the-layout-of-a-view.md | 8 ++------ .../customizing-the-roadmap-layout.md | 4 +++- .../planning-and-tracking-with-projects/index.md | 2 +- .../learning-about-projects/about-projects.md | 2 +- .../understanding-fields/about-date-fields.md | 4 ---- .../understanding-fields/about-iteration-fields.md | 4 ---- data/reusables/projects/create-project.md | 8 ++++---- data/reusables/projects/create-user-project.md | 12 ++++++------ data/reusables/projects/customize/sum.md | 2 +- data/reusables/projects/open-item-menu.md | 2 +- data/reusables/projects/select-an-item.md | 2 +- 11 files changed, 20 insertions(+), 30 deletions(-) diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view.md index 716007f71851..502d9d00e915 100644 --- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view.md +++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view.md @@ -1,7 +1,7 @@ --- title: Changing the layout of a view shortTitle: Changing the layout -intro: 'You can view your project as a high-density table{% ifversion projects-v2-roadmaps %}, as a kanban board, or as a timeline-style roadmap{% else %} or as a kanban board{% endif %}.' +intro: 'You can view your project as a high-density table, as a kanban board, or as a timeline-style roadmap.' versions: feature: projects-v2 redirect_from: @@ -24,21 +24,17 @@ topics: ![Screenshot showing an example board layout.](/assets/images/help/projects-v2/example-board.png) -{% ifversion projects-v2-roadmaps %} - ## About the roadmap layout {% data reusables.projects.about-roadmap-layout %} For more information, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout)." ![Screenshot showing an example roadmap layout.](/assets/images/help/projects-v2/example-roadmap.png) -{% endif %} - ## Changing the project layout You can set each view in your project to a different layout. {% data reusables.projects.open-view-menu %} -1. Under "Layout", click either **Table**{% ifversion projects-v2-roadmaps %}, **Board** or **Roadmap**{% else %} or **Board**{% endif %}. +1. Under "Layout", click either **Table**, **Board** or **Roadmap**. Alternatively, open the project command palette by pressing {% data variables.projects.command-palette-shortcut %} and start typing "Switch layout." 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 074494593026..829b670e53d5 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 @@ -3,7 +3,9 @@ title: Customizing the roadmap layout shortTitle: Customizing roadmaps intro: You can use the roadmap layout to view your project's items on a timeline. versions: - feature: projects-v2-roadmaps + fpt: '*' + ghes: '*' + ghec: '*' type: tutorial topics: - Projects diff --git a/content/issues/planning-and-tracking-with-projects/index.md b/content/issues/planning-and-tracking-with-projects/index.md index c232de9adf86..e161ec834bc9 100644 --- a/content/issues/planning-and-tracking-with-projects/index.md +++ b/content/issues/planning-and-tracking-with-projects/index.md @@ -23,6 +23,6 @@ redirect_from: {% data reusables.projects.projects-beta %} -A project is an adaptable collection of items that you can view as a table{% ifversion projects-v2-roadmaps %}, a kanban board, or a roadmap{% else %} or a kanban board{% endif %} and that stays up-to-date with {% data variables.product.company_short %} data. Your projects can track issues, pull requests, and ideas that you note down. +A project is an adaptable collection of items that you can view as a table, a kanban board, or a roadmap and that stays 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 create and customize multiple views by filtering, sorting, and grouping issues and pull requests,{% ifversion projects-v2-insights %} visualize work with configurable charts,{% endif %} and add custom fields to track metadata specific to your team. Rather than enforcing a specific methodology, a project provides flexible features you can customize to your team’s needs and processes. 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 d6cc28d978c0..6ff715dad632 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 @@ -59,4 +59,4 @@ These relationships are displayed on the issue, as well as the Tracked by and Tr Quickly answer your most pressing questions by tailoring your project view to give you the information you need. You can save these views, allowing you to quickly return to them as needed and make them available to your team. Views not only let you scope down the items listed but also offer two different layout options. -You can view your project as a high-density table layout{% ifversion projects-v2-roadmaps %}, as a kanban board, or a timeline-style roadmap{% else %} or a kanban board{% endif %}. For more information about the different layout options, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view)." +You can view your project as a high-density table layout, as a kanban board, or a timeline-style roadmap. For more information about the different layout options, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view)." diff --git a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-date-fields.md b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-date-fields.md index 2b5b24868330..e467b8d2374d 100644 --- a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-date-fields.md +++ b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-date-fields.md @@ -13,12 +13,8 @@ redirect_from: You can filter for date values using the `YYYY-MM-DD` format, for example: `date:2022-07-01`. You can also use operators, such as `>`, `>=`, `<`, `<=`, and `..`. For example, `date:>2022-07-01` and `date:2022-07-01..2022-07-31`. You can also provide `@today` to represent the current day in your filter. For more information, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects)." -{% ifversion projects-v2-roadmaps %} - If your project makes use of date fields, you can use the roadmap layout to view items on a timeline. For more information, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view)" and "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout)." -{% endif %} - ## Adding a date field {% data reusables.projects.new-field %} diff --git a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-iteration-fields.md b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-iteration-fields.md index 1a8f0f62f98e..4b6b6508af91 100644 --- a/content/issues/planning-and-tracking-with-projects/understanding-fields/about-iteration-fields.md +++ b/content/issues/planning-and-tracking-with-projects/understanding-fields/about-iteration-fields.md @@ -18,12 +18,8 @@ You can filter for iterations by specifying the iteration name or `@current` for When you first create an iteration field, three iterations are automatically created. You can add additional iterations and make other changes on your project's settings page. -{% ifversion projects-v2-roadmaps %} - If your project makes use of iteration fields, you can use the roadmap layout to view items on a timeline. For more information, see "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/changing-the-layout-of-a-view)" and "[AUTOTITLE](/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-roadmap-layout)." -{% endif %} - ## Adding an iteration field {% data reusables.projects.new-field %} diff --git a/data/reusables/projects/create-project.md b/data/reusables/projects/create-project.md index aecbc2d0845b..a54106f3b084 100644 --- a/data/reusables/projects/create-project.md +++ b/data/reusables/projects/create-project.md @@ -6,16 +6,16 @@ 1. Click **New project**. {%- ifversion projects-v2-org-templates-GA-updates %} 1. Select which type of project or template you want to use. - * To create a blank project, under "Start from scratch", click **Table**{% ifversion projects-v2-roadmaps %}, **Roadmap**,{% endif %} or **Board**. + * To create a blank project, under "Start from scratch", click **Table**, **Roadmap**, or **Board**. * To create a project from a template, click the template you want to use. You can select from the built-in templates curated by {% data variables.product.company_short %}, the templates created by your organization, and the recommended templates that have been chosen by your organization. 1. Optionally, if you selected a template, review the fields, views, workflows, and insights that will be created. 1. In the text box under "Project name", type a name for your new project. 1. Click **Create project**. {%- else %} 1. Optionally, in the text box under "Project name", type a name for your new project. - + ![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**{% ifversion projects-v2-roadmaps %}, **Roadmap**,{% endif %} or **Board**. + +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 **Create**. {%- endif %} diff --git a/data/reusables/projects/create-user-project.md b/data/reusables/projects/create-user-project.md index c11fbe1c8a43..2a8625a88b6e 100644 --- a/data/reusables/projects/create-user-project.md +++ b/data/reusables/projects/create-user-project.md @@ -1,21 +1,21 @@ {% data reusables.profile.access_profile %} 1. On your profile, click {% octicon "table" aria-hidden="true" %} **Projects**. - + ![Screenshot showing profile tabs. The 'Projects' tab is highlighted with an orange outline.](/assets/images/help/projects-v2/tab-projects.png) - + 1. Click **New project**. {%- ifversion projects-v2-org-templates-GA-updates %} 1. Select which type of project or template you want to use. - * To create a blank project, under "Start from scratch", click **Table**{% ifversion projects-v2-roadmaps %}, **Roadmap**,{% endif %} or **Board**. + * To create a blank project, under "Start from scratch", click **Table**, **Roadmap**, or **Board**. * To create a project from a template, click the built-in template that you want to use. 1. Optionally, if you selected a template, review the fields, views, workflows, and insights that will be created. 1. In the text box under "Project name", type a name for your new project. 1. Click **Create project**. {%- else %} 1. Optionally, in the text box under "Project name", type a name for your new project. - + ![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**{% ifversion projects-v2-roadmaps %}, **Roadmap**,{% endif %} or **Board**. + +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 **Create**. {%- endif %} diff --git a/data/reusables/projects/customize/sum.md b/data/reusables/projects/customize/sum.md index 201bdafcd08b..7c9a9ffcc8f2 100644 --- a/data/reusables/projects/customize/sum.md +++ b/data/reusables/projects/customize/sum.md @@ -1,6 +1,6 @@ You can configure a view to show the sum of one of more number fields, including a count of items in the group or column. For example, if you have a number field tracking the number of hours each item may take to complete, you can display of sum of those hours for each group or column. -In a board layout, field sums are displayed at the top of each column. In table{% ifversion projects-v2-roadmaps %} and roadmap layouts{% else %} layout{% endif %}, when you enable grouping by a field, field sums are included in each group's header. +In a board layout, field sums are displayed at the top of each column. In table and roadmap layouts, when you enable grouping by a field, field sums are included in each group's header. {% data reusables.projects.open-view-menu %} 1. Click {% octicon "number" aria-hidden="true" %} **Field sum**. diff --git a/data/reusables/projects/open-item-menu.md b/data/reusables/projects/open-item-menu.md index c2971b78efb5..4c16b8edea43 100644 --- a/data/reusables/projects/open-item-menu.md +++ b/data/reusables/projects/open-item-menu.md @@ -1 +1 @@ -1. Click {% octicon "triangle-down" aria-label="Row actions" %} (in table{% ifversion projects-v2-roadmaps %} or roadmap{% endif %} layout) or {% octicon "kebab-horizontal" aria-hidden="true" %} (in board layout). +1. Click {% octicon "triangle-down" aria-label="Row actions" %} (in table or roadmap layout) or {% octicon "kebab-horizontal" aria-hidden="true" %} (in board layout). diff --git a/data/reusables/projects/select-an-item.md b/data/reusables/projects/select-an-item.md index 85480df51936..f2bb5ccf9a65 100644 --- a/data/reusables/projects/select-an-item.md +++ b/data/reusables/projects/select-an-item.md @@ -1,4 +1,4 @@ -1. {% ifversion projects-v2-roadmaps %}If you're using a table or board layout, first select{% else %}Select{% endif %} the item: +1. If you're using a table or board layout, first select the item: * In a table layout, click on the row number. * In a board layout, click on the card. From 2576645757e7cdca6354de1c48b74b1d0f413472 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 26 Jun 2024 07:34:46 -0400 Subject: [PATCH 5/6] Port `fastly-cache-test.js` to TypeScript (#51405) --- .../middleware/{fastly-cache-test.js => fastly-cache-test.ts} | 4 ++-- src/frame/middleware/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/frame/middleware/{fastly-cache-test.js => fastly-cache-test.ts} (96%) diff --git a/src/frame/middleware/fastly-cache-test.js b/src/frame/middleware/fastly-cache-test.ts similarity index 96% rename from src/frame/middleware/fastly-cache-test.js rename to src/frame/middleware/fastly-cache-test.ts index 306c3e6ff483..f84423f6a3c9 100644 --- a/src/frame/middleware/fastly-cache-test.js +++ b/src/frame/middleware/fastly-cache-test.ts @@ -15,7 +15,7 @@ const router = express.Router() router.get('/*', function (req, res) { // If X-CacheTest-Error is set, simulate the site being down (regardless of URL) if (req.get('X-CacheTest-Error')) { - res.status(parseInt(req.get('X-CacheTest-Error'))).end() + res.status(parseInt(req.get('X-CacheTest-Error') as string)).end() return } @@ -24,7 +24,7 @@ router.get('/*', function (req, res) { const staleWhileRevalidateParam = req.get('X-CacheTest-StaleWhileRevalidate') ?? '60' const maxAgeParam = req.get('X-CacheTest-MaxAge') ?? '300' - const path = req.params[0] + const path = req.path.slice(1) const content = ` diff --git a/src/frame/middleware/index.ts b/src/frame/middleware/index.ts index ccb895143f13..37fbcb52a47a 100644 --- a/src/frame/middleware/index.ts +++ b/src/frame/middleware/index.ts @@ -57,7 +57,7 @@ import archivedAssetRedirects from '@/archives/middleware/archived-asset-redirec import favicons from './favicons' import setStaticAssetCaching from '@/assets/middleware/static-asset-caching' import fastHead from './fast-head' -import fastlyCacheTest from './fastly-cache-test.js' +import fastlyCacheTest from './fastly-cache-test' import trailingSlashes from './trailing-slashes.js' import fastlyBehavior from './fastly-behavior.js' import mockVaPortal from './mock-va-portal.js' From b0373dfb6636eb5f5d27a79f8af1de15fc740165 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:38:06 +0100 Subject: [PATCH 6/6] Clarify information provided around privately reporting a security vulnerability (#51349) --- .../privately-reporting-a-security-vulnerability.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability.md b/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability.md index c0491d9d8a12..5456097440af 100644 --- a/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability.md +++ b/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability.md @@ -40,7 +40,7 @@ For security researchers, the benefits of using private vulnerability reporting ## Privately reporting a security vulnerability -If you do not have admin or security permissions for a public repository, you can still privately report a security vulnerability to repository maintainers. You can also evaluate the general security of a public repository and suggest a security policy. For more information, see "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/evaluating-the-security-settings-of-a-repository)." +If a public repository has private vulnerability reporting enabled, anyone can privately report a security vulnerability to repository maintainers. Users can also evaluate the general security of a public repository and suggest a security policy. For more information, see "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/evaluating-the-security-settings-of-a-repository)." {% data reusables.security-advisory.reporting-a-vulnerability-non-admin %}