Skip to content

Commit 04e086b

Browse files
authored
Merge pull request #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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 16 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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 %} |

0 commit comments

Comments
 (0)