Skip to content

Commit 04e086b

Browse files
authored
Merge pull request github#37450 from github/repo-sync
Repo sync
2 parents 257d813 + c462121 commit 04e086b

File tree

24 files changed

+64
-27
lines changed

24 files changed

+64
-27
lines changed

content/actions/security-for-github-actions/security-guides/automatic-token-authentication.md

+2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ The following table shows the permissions granted to the `GITHUB_TOKEN` by defau
9595
| packages | read/write | read | read |
9696
| pages | read/write | none | read |
9797
| pull-requests | read/write | none | read |
98+
| {% ifversion projects-v1 %} |
9899
| repository-projects | read/write | none | read |
100+
| {% endif %} |
99101
| security-events | read/write | none | read |
100102
| statuses | read/write | none | read |
101103

content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The events listed in your security log are triggered by your actions. Actions ar
4949
| {% endif %} |
5050
| `personal_access_token` | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). |
5151
| `profile_picture`| Contains all activities related to your profile picture. |
52-
| `project` | Contains all activities related to {% data variables.projects.projects_v1_boards %}. |
52+
| `project` | Contains all activities related to {% data variables.projects.projects_v2 %}. |
5353
| `public_key` | Contains all activities related to [your public SSH keys](/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account). |
5454
| `repo`| Contains all activities related to the repositories you own. |
5555
| {% ifversion fpt or ghec %} |

content/code-security/dependabot/troubleshooting-dependabot/troubleshooting-dependabot-on-github-actions.md

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ on: pull_request
9292
permissions:
9393
pull-requests: write
9494
issues: write
95-
repository-projects: write
9695
...
9796
9897
jobs:

content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md

-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ on: pull_request
5656
permissions:
5757
pull-requests: write
5858
issues: write
59-
repository-projects: write
6059

6160
jobs:
6261
dependabot:
@@ -93,7 +92,6 @@ on: pull_request
9392
permissions:
9493
pull-requests: write
9594
issues: write
96-
repository-projects: write
9795

9896
jobs:
9997
dependabot:

content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ When you block a user:
3030
* You are removed as a collaborator on their repositories
3131
* Their sponsorship of you is canceled
3232
* Any pending repository or account successor invitations to or from the blocked user are canceled
33-
* The user is removed as a collaborator from all the projects and {% data variables.projects.projects_v1_boards %} owned by you
34-
* You are removed as a collaborator from all the projects and {% data variables.projects.projects_v1_boards %} owned by the user
33+
* The user is removed as a collaborator from all the projects owned by you
34+
* You are removed as a collaborator from all the projects owned by the user
3535

3636
After you've blocked a user, they cannot:
3737
* Send you any notifications, including by [@mentioning](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams) your username
@@ -44,8 +44,8 @@ After you've blocked a user, they cannot:
4444
* Cross-reference your repositories in comments
4545
* Fork, watch, pin, or star your repositories
4646
* Sponsor you
47-
* Add you as a collaborator on their projects and {% data variables.projects.projects_v1_boards %}
48-
* Make changes to your public projects and {% data variables.projects.projects_v1_boards %}
47+
* Add you as a collaborator on their projects
48+
* Make changes to your public projects
4949

5050
In repositories you own, blocked users also cannot:
5151
* Open issues

content/issues/planning-and-tracking-with-projects/creating-projects/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 'Creating {% data variables.projects.projects_v2 %}'
33
shortTitle: 'Creating {% data variables.projects.projects_v2 %}'
4-
intro: 'Learn about creating projects and migrating your {% data variables.projects.projects_v1_boards %}.'
4+
intro: 'Learn about creating projects and copying existing projects.'
55
versions:
66
feature: projects-v2
77
topics:

content/issues/tracking-your-work-with-issues/configuring-issues/planning-and-tracking-work-for-your-team-or-project.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ redirect_from:
1616

1717
You can use {% data variables.product.prodname_dotcom %} repositories, issues, projects, and other tools to plan and track your work, whether working on an individual project or cross-functional team.
1818

19-
In this guide, you will learn how to create and set up a repository for collaborating with a group of people, create issue templates and forms, open issues and use task lists to break down work, and establish a {% data variables.projects.projects_v1_board %} for organizing and tracking issues.
19+
In this guide, you will learn how to create and set up a repository for collaborating with a group of people, create issue templates and forms, open issues and use task lists to break down work, and establish a {% data variables.projects.project_v2 %} for organizing and tracking issues.
2020

2121
## Creating a repository
2222

@@ -153,7 +153,7 @@ Below is an example of a `front-end` label that we created and added to the issu
153153

154154
![Screenshot of an issue called "Front-end work for Project Octocat." In the right sidebar, in the "Labels" section, the "front-end" label is applied.](/assets/images/help/issues/quickstart-add-label-to-issue.png)
155155

156-
## Adding issues to a {% data variables.projects.projects_v2 %}
156+
## Adding issues to a {% data variables.projects.project_v2 %}
157157

158158
You can use {% data variables.projects.projects_v2 %} on {% data variables.product.prodname_dotcom %} to plan and track the work for your team. A project is a customizable spreadsheet that integrates with your issues and pull requests on {% data variables.product.prodname_dotcom %}, automatically staying up-to-date with the information on {% data variables.product.prodname_dotcom %}. You can customize the layout by filtering, sorting, and grouping your issues and PRs. To get started with projects, see [AUTOTITLE](/issues/planning-and-tracking-with-projects/learning-about-projects/quickstart-for-projects).
159159

content/migrations/using-ghe-migrator/about-ghe-migrator.md

+2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ The items in the table below can be migrated with a repository. Any items not sh
4343
| Wikis | All wiki data is migrated.
4444
| Teams | **@mentions** of teams are rewritten to match the target.
4545
| Milestones | Timestamps are preserved.
46+
| {% ifversion projects-v1 %} |
4647
| {% data variables.product.prodname_projects_v1_caps %} boards | {% data variables.projects.projects_v1_boards_caps %} associated with the repository and with the organization that owns the repository are migrated. {% data variables.product.prodname_projects_v2 %}, the all-new projects experience, is not supported.
48+
| {% endif %} |
4749
| Issues | Issue references and timestamps are preserved.
4850
| Issue comments | Cross-references to comments are rewritten for the target instance.
4951
| Pull requests | Cross-references to pull requests are rewritten to match the target. Timestamps are preserved.

content/migrations/using-ghe-migrator/migrating-data-to-github-enterprise-server.md

+16
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ The _conflicts.csv_ file contains a _migration map_ of conflicts and recommended
7575
| `organization` | `https://example-gh.source/octo-org` | `https://example-gh.target/octo-org` | `map` |
7676
| `repository` | `https://example-gh.source/octo-org/widgets` | `https://example-gh.target/octo-org/widgets` | `rename` |
7777
| `team` | `https://example-gh.source/orgs/octo-org/teams/admins` | `https://example-gh.target/orgs/octo-org/teams/admins` | `merge` |
78+
| {% ifversion projects-v1 %} |
7879
| `project` | `https://example-gh.source/octo-org/widgets/projects/1` | `https://example-gh.target/octo-org/projects/1` | `merge` |
80+
| {% endif %} |
7981

8082
Each row in _conflicts.csv_ provides the following information:
8183

@@ -93,10 +95,22 @@ There are several different mapping actions that `ghe-migrator` can take when tr
9395
| `action` | Description | Applicable models |
9496
|------------------------|-------------|-------------------|
9597
| `import` | (default) Data from the source is imported to the target. | All record types
98+
| {% ifversion projects-v1 %} |
9699
| `map` | Instead of creating a new model based on the source data, an existing record in the target is used. Useful for importing a repository into an existing organization or mapping user identities in the target to user identities in the source. | Users, organizations, projects
100+
| {% else %} |
101+
| `map` | Instead of creating a new model based on the source data, an existing record in the target is used. Useful for importing a repository into an existing organization or mapping user identities in the target to user identities in the source. | Users, organizations
102+
| {% endif %} |
103+
| {% ifversion projects-v1 %} |
97104
| `rename` | Data from the source is renamed, then copied over to the target. | Users, organizations, repositories, projects
105+
| {% else %} |
106+
| `rename` | Data from the source is renamed, then copied over to the target. | Users, organizations, repositories
107+
| {% endif %} |
98108
| `map_or_rename` | If the target exists, map to that target. Otherwise, rename the imported model. | Users
109+
| {% ifversion projects-v1 %} |
99110
| `merge` | Data from the source is combined with existing data on the target. | Teams, projects
111+
| {% else %} |
112+
| `merge` | Data from the source is combined with existing data on the target. | Teams
113+
| {% endif %} |
100114

101115
**We strongly suggest you review the _conflicts.csv_ file and use `ghe-migrator audit` to ensure that the proper actions are being taken.** If everything looks good, you can continue.
102116

@@ -195,7 +209,9 @@ The record types match those found in the [migrated data](/migrations/using-ghe-
195209
| Repositories | `repository`
196210
| Teams | `team`
197211
| Milestones | `milestone`
212+
| {% ifversion projects-v1 %} |
198213
| {% data variables.projects.projects_v1_boards_caps %} | `project`
214+
| {% endif %} |
199215
| Issues | `issue`
200216
| Issue comments | `issue_comment`
201217
| Pull requests | `pull_request`

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
9292
| {% endif %} |
9393
| `personal_access_token` | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
9494
| `profile_picture`| Contains all activities related to your organization's profile picture.
95-
| `project` | Contains all activities related to {% data variables.projects.projects_v1_boards %}.
95+
| `project` | Contains all activities related to {% data variables.projects.projects_v2_and_v1 %}.
9696
| `protected_branch` | Contains all activities related to protected branches.
9797
| `repo` | Contains activities related to the repositories owned by your organization.
9898
| {% ifversion fpt or ghec %} |

content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: 'Disabling projects in your organization'
3-
intro: 'Organization owners can turn off organization-wide {% data variables.projects.projects_v2 %}, organization-wide {% data variables.projects.projects_v1_boards %}, and repository-level {% data variables.projects.projects_v1_boards %} in an organization.'
3+
intro: 'Organization owners can turn off organization-wide {% data variables.projects.projects_v2 %}{% ifversion projects-v1 %}, organization-wide {% data variables.projects.projects_v1_boards %}, and repository-level {% data variables.projects.projects_v1_boards %}{% endif %} in an organization.'
44
redirect_from:
55
- /github/managing-your-work-on-github/managing-project-boards/disabling-project-boards-in-your-organization
66
- /articles/disabling-project-boards-in-your-organization

content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ redirect_from:
55
- /articles/integrating-jira-with-your-organization-project-board
66
- /github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board
77
versions:
8-
ghes: '*'
8+
feature: projects-v1
99
shortTitle: Integrate Jira
1010
allowTitleToDifferFromFilename: true
1111
---

content/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization.md

+2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ Some of the features listed below are limited to organizations using {% data var
110110
| {% endif %} |
111111
| Manage [topics](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
112112
| Enable wikis and restrict wiki editors | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
113+
| {% ifversion projects-v1 %} |
113114
| Enable {% data variables.projects.projects_v1_boards %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
115+
| {% endif %} |
114116
| Configure [pull request merges](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
115117
| Configure [a publishing source for {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
116118
| {% ifversion copilot %} |

content/repositories/creating-and-managing-repositories/transferring-a-repository.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ topics:
2323
---
2424
## About repository transfers
2525

26-
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).
26+
When you transfer a repository to a new owner, they can immediately administer the repository's contents, issues, pull requests, releases, {% data variables.projects.projects_v2 %}, and settings. You can also change the repository name while transferring a repository. See [AUTOTITLE](/repositories/creating-and-managing-repositories/renaming-a-repository).
2727

2828
Prerequisites for repository transfers:
2929
* 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 %}

content/rest/using-the-rest-api/issue-event-types.md

+16
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Issue events all have the same object structure, except events that are only ava
2424

2525
{% data reusables.issue-events.issue-event-common-properties %}
2626

27+
{% ifversion projects-v1 %}
28+
2729
## added_to_project
2830

2931
The issue or pull request was added to a {% data variables.projects.projects_v1_board %}. {% data reusables.projects.disabled-projects %}
@@ -47,6 +49,8 @@ This event is available for the following issue types.
4749
{% data reusables.issue-events.issue-event-common-properties %}
4850
{% data reusables.issue-events.project-card-properties %}
4951

52+
{% endif %}
53+
5054
## assigned
5155

5256
The issue or pull request was assigned to a user.
@@ -244,6 +248,8 @@ This event is available for the following issue types.
244248

245249
{% data reusables.issue-events.issue-event-common-properties %}
246250

251+
{% ifversion projects-v1 %}
252+
247253
## converted_note_to_issue
248254

249255
The issue was created by converting a note in a {% data variables.projects.projects_v1_board %} to an issue. {% data reusables.projects.disabled-projects %}
@@ -266,6 +272,8 @@ This event is available for the following issue types.
266272
{% data reusables.issue-events.issue-event-common-properties %}
267273
{% data reusables.issue-events.project-card-properties %}
268274

275+
{% endif %}
276+
269277
## converted_to_discussion
270278

271279
The issue was closed and converted to a discussion.
@@ -556,6 +564,8 @@ This event is available for the following issue types.
556564
`milestone` | `object` | The milestone object.
557565
`milestone[title]` | `string` | The title of the milestone.
558566

567+
{% ifversion projects-v1 %}
568+
559569
## moved_columns_in_project
560570

561571
The issue or pull request was moved between columns in a {% data variables.projects.projects_v1_board %}. {% data reusables.projects.disabled-projects %}
@@ -580,6 +590,8 @@ This event is available for the following issue types.
580590
{% data reusables.issue-events.project-card-properties %}
581591
`previous_column_name` | `string` | The name of the column the issue was moved from.
582592

593+
{% endif %}
594+
583595
## pinned
584596

585597
The issue was pinned.
@@ -635,6 +647,8 @@ This event is available for the following issue types.
635647

636648
{% data reusables.issue-events.issue-event-common-properties %}
637649

650+
{% ifversion projects-v1 %}
651+
638652
## removed_from_project
639653

640654
The issue or pull request was removed from a {% data variables.projects.projects_v1_board %}. {% data reusables.projects.disabled-projects %}
@@ -658,6 +672,8 @@ This event is available for the following issue types.
658672
{% data reusables.issue-events.issue-event-common-properties %}
659673
{% data reusables.issue-events.project-card-properties %}
660674

675+
{% endif %}
676+
661677
## renamed
662678

663679
The issue or pull request title was changed.

content/search-github/searching-on-github/searching-issues-and-pull-requests.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@ You can use the `project` qualifier to find issues that are associated with a sp
198198
| Qualifier | Example
199199
| ------------- | -------------
200200
| <code>project:<em>PROJECT_NUMBER</em></code> | **project:github/57** matches issues owned by GitHub that are associated with the organization's project 57.
201+
| {% ifversion projects-v1 %} |
201202
| <code>project:<em>REPOSITORY/PROJECT_NUMBER</em></code> | **project:github-linguist/linguist/1** matches issues that are associated with project 1 in @github's linguist repository.
203+
| {% endif %} |
202204

203205
## Search by commit status
204206

@@ -367,7 +369,7 @@ You can narrow your search to issues and pull requests that are missing certain
367369
| `no:label` | [**priority no:label**](https://github.com/search?q=priority+no%3Alabel&type=Issues) matches issues and pull requests with the word "priority" that also don't have any labels.
368370
| `no:milestone` | [**sprint no:milestone type:issue**](https://github.com/search?q=sprint+no%3Amilestone+type%3Aissue&type=Issues) matches issues not associated with a milestone containing the word "sprint."
369371
| `no:assignee` | [**important no:assignee language:java type:issue**](https://github.com/search?q=important+no%3Aassignee+language%3Ajava+type%3Aissue&type=Issues) matches issues not associated with an assignee, containing the word "important," and in Java repositories.
370-
| `no:project` | [**build no:project**](https://github.com/search?utf8=%E2%9C%93&q=build+no%3Aproject&type=Issues) matches issues not associated with a {% data variables.projects.projects_v1_board %}, containing the word "build."
372+
| `no:project` | [**build no:project**](https://github.com/search?utf8=%E2%9C%93&q=build+no%3Aproject&type=Issues) matches issues not associated with a {% data variables.projects.project_v2 %}, containing the word "build."
371373

372374
## Further reading
373375

data/features/projects-v1-can-create.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Can the user create a Project (classic)?
33
# n.b. /managing-project-boards/copying-a-project-board.md retains ghec/fpt versioning.
44
versions:
5-
ghes: '*'
5+
ghes: '<=3.16'
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Ability to create new repository level projects (classic)
22
versions:
3-
ghes: '*'
3+
ghes: '<=3.16'

data/features/projects-v1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Projects (classic)
33
# n.b. /managing-project-boards/copying-a-project-board.md retains ghec/fpt versioning.
44
versions:
5-
ghes: '*'
5+
ghes: '<=3.16'
+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# Migrating from projects (classic)
22
versions:
3-
fpt: '*'
4-
ghec: '*'
5-
ghes: '>=3.13'
3+
ghes: '>=3.13 <=3.16'

data/reusables/actions/github-token-available-permissions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ permissions:
1212
discussions: read|write|none
1313
packages: read|write|none
1414
pages: read|write|none
15-
pull-requests: read|write|none
16-
repository-projects: read|write|none
15+
pull-requests: read|write|none{% ifversion projects-v1 %}
16+
repository-projects: read|write|none{% endif %}
1717
security-events: read|write|none
1818
statuses: read|write|none
1919
```

0 commit comments

Comments
 (0)