Merge branch 'main' into patch-3
This commit is contained in:
Ramya Parimi
@@ -86,7 +86,7 @@ async function run() {
|
||||
'utf8'
|
||||
)
|
||||
const issueLabels =
|
||||
milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-3']
|
||||
milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive']
|
||||
const issueTitle = `[${nextMilestoneDate}] Enterprise Server ${versionNumber} ${milestone} (technical steps)`
|
||||
|
||||
const issueBody = `GHES ${versionNumber} ${milestone} occurs on ${nextMilestoneDate}.
|
||||
|
||||
@@ -37,5 +37,5 @@ jobs:
|
||||
}
|
||||
}
|
||||
} catch(e) {
|
||||
console.log(error);
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
64
.github/workflows/notify-when-maintainers-cannot-edit.yaml
vendored
Normal file
64
.github/workflows/notify-when-maintainers-cannot-edit.yaml
vendored
Normal file
@@ -0,0 +1,64 @@
|
||||
name: Notify When Maintainers Cannot Edit
|
||||
|
||||
# **What it does**: Notifies the author of a PR when their PR does not allow maintainers to edit it.
|
||||
# **Why we have it**: To prevent having to do this manually.
|
||||
# **Who does it impact**: Open-source.
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
types:
|
||||
- opened
|
||||
|
||||
permissions:
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
notify-when-maintainers-cannot-edit:
|
||||
if: github.repository == 'github/docs'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
|
||||
with:
|
||||
script: |
|
||||
const query = `
|
||||
query($number: Int!) {
|
||||
repository(owner: "github", name: "docs") {
|
||||
pullRequest(number: $number) {
|
||||
headRepositoryOwner {
|
||||
login
|
||||
}
|
||||
maintainerCanModify
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const pullNumber = context.issue.number;
|
||||
const variables = { number: pullNumber };
|
||||
|
||||
try {
|
||||
console.log(`Check github/docs#${pullNumber} for maintainer edit access ...`);
|
||||
const result = await github.graphql(query, variables);
|
||||
|
||||
console.log(JSON.stringify(result, null, 2));
|
||||
|
||||
const pullRequest = result.repository.pullRequest;
|
||||
|
||||
if (pullRequest.headRepositoryOwner.login === 'github') {
|
||||
console.log('PR owned by github');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!pullRequest.maintainerCanModify) {
|
||||
console.log('PR not owned by github and does not have maintainer edits enabled');
|
||||
|
||||
await github.issues.createComment({
|
||||
issue_number: pullNumber,
|
||||
owner: 'github',
|
||||
repo: 'docs',
|
||||
body: "Thanks for submitting a PR to the GitHub Docs project!\n\nIn order to review and merge PRs most efficiently, we require that all PRs grant maintainer edit access before we review them. For information on how to do this, [see the documentation](https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)."
|
||||
});
|
||||
}
|
||||
} catch(e) {
|
||||
console.log(e);
|
||||
}
|
||||
11
.github/workflows/staging-deploy-pr.yml
vendored
11
.github/workflows/staging-deploy-pr.yml
vendored
@@ -79,9 +79,18 @@ jobs:
|
||||
name: prRepoName
|
||||
}
|
||||
} = run
|
||||
const headLabel = `${prRepoOwner}:${headBranch}`
|
||||
|
||||
const prIsInternal = owner === prRepoOwner && repo === prRepoName
|
||||
let headLabel = `${prRepoOwner}:${headBranch}`
|
||||
|
||||
// If the PR is external, prefix its head branch name with the
|
||||
// forked repo owner's login and their fork repo name e.g.
|
||||
// "octocat/my-fork:docs". We need to include the fork repo
|
||||
// name as well to account for an API issue (this will work fine
|
||||
// if they don't have a different fork repo name).
|
||||
if (!prIsInternal) {
|
||||
headLabel = `${prRepoOwner}/${prRepoName}:${headBranch}`
|
||||
}
|
||||
|
||||
// If the PR is external, prefix its head branch name with the
|
||||
// forked repo owner's login, e.g. "octocat:docs"
|
||||
|
||||
@@ -43,7 +43,7 @@ The repository owner has full control of the repository. In addition to the acti
|
||||
| Delete and restore packages | "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)" |{% endif %}{% ifversion ghes = 2.22 or ghes = 3.0 or ghae %}
|
||||
| Delete packages | "[Deleting packages](/packages/learn-github-packages/deleting-a-package)" |{% endif %}
|
||||
| Customize the repository's social media preview | "[Customizing your repository's social media preview](/github/administering-a-repository/customizing-your-repositorys-social-media-preview)" |
|
||||
| Create a template from the repository | "[Creating a template repository](/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)" |{% ifversion fpt or ghes or ghae-issue-4864 %}
|
||||
| Create a template from the repository | "[Creating a template repository](/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)" |{% ifversion fpt or ghes > 2.22 or ghae-issue-4864 %}
|
||||
| Control access to {% data variables.product.prodname_dependabot_alerts %} alerts for vulnerable dependencies | "[Managing security and analysis settings for your repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-security-alerts)" |{% endif %}{% ifversion fpt %}
|
||||
| Dismiss {% data variables.product.prodname_dependabot_alerts %} in the repository | "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" |
|
||||
| Manage data use for a private repository | "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)"|{% endif %}
|
||||
|
||||
@@ -159,7 +159,7 @@ gh pr create --web
|
||||
1. Once you've committed changes to your local copy of the repository, click the **Create Pull Request** icon.
|
||||
|
||||
1. Check that the local branch and repository you're merging from, and the remote branch and repository you're merging into, are correct. Then give the pull request a title and a description.
|
||||
|
||||
|
||||
1. Click **Create**.
|
||||
|
||||
For more information on creating pull requests in {% data variables.product.prodname_codespaces %}, see "[Using Codespaces for pull requests](/codespaces/developing-in-codespaces/using-codespaces-for-pull-requests)."
|
||||
|
||||
@@ -12,5 +12,5 @@ versions:
|
||||
|
||||
If you use {% data variables.product.prodname_copilot %}, the {% data variables.product.prodname_copilot %} extension/plugin will collect usage information about events generated by interacting with the integrated development environment (IDE). These events include {% data variables.product.prodname_copilot %} performance, features used, and suggestions accepted, modified and accepted, or dismissed. This information may include personal data, including your User Personal Information, as defined in the [GitHub Privacy Statement](/github/site-policy/github-privacy-statement).
|
||||
|
||||
This usage information is used by {% data variables.product.company_short %}, and shared with Microsoft and OpenAI, to develop and improve the extension/plugin and related products. OpenAI also uses this usage information to perform other services related to {% data variables.product.prodname_copilot %}. For example, when you edit files with the {% data variables.product.prodname_copilot %} extension/plugin enabled, file content snippets, suggestions, and any modifications to suggestions will be shared with {% data variables.product.company_short %}, Microsoft, and OpenAI, and used for diagnostic purposes to improve suggestions and related products. {% data variables.product.prodname_copilot %} relies on file content for context, both in the file you are editing and potentially other files open in the same IDE instance. When you are using {% data variables.product.prodname_copilot %}, it may also collect the URLs of repositories or file paths for relevant files. {% data variables.product.prodname_copilot %} does not use these URLs, file paths, or snippets collected in your telemetry as input to suggest code for other users of {% data variables.product.prodname_copilot %}. This information is treated as confidential information and accessed on a need-to-know basis. You are prohibited from collecting telemetry data about other users of {% data variables.product.prodname_copilot %} from the {% data variables.product.prodname_copilot %} extension/plugin. For more details about {% data variables.product.prodname_copilot %} telemetry, please see "[About {% data variables.product.prodname_copilot %} telemetry](/github/copilot/about-github-copilot-telemetry)." You may revoke your consent to the telemetry and personal data processing operations described in this paragraph by contacting GitHub and requesting removal from the technical preview.
|
||||
This usage information is used by {% data variables.product.company_short %}, and shared with Microsoft and OpenAI, to develop and improve the extension/plugin and related products. OpenAI also uses this usage information to perform other services related to {% data variables.product.prodname_copilot %}. For example, when you edit files with the {% data variables.product.prodname_copilot %} extension/plugin enabled, file content snippets, suggestions, and any modifications to suggestions will be shared with {% data variables.product.company_short %}, Microsoft, and OpenAI, and used for diagnostic purposes to improve suggestions and related products. {% data variables.product.prodname_copilot %} relies on file content for context, both in the file you are editing and potentially other files open in the same IDE instance. When you are using {% data variables.product.prodname_copilot %}, it may also collect the URLs of repositories or file paths for relevant files. {% data variables.product.prodname_copilot %} does not use these URLs, file paths, or snippets collected in your telemetry as suggestions for other users of {% data variables.product.prodname_copilot %}. This information is treated as confidential information and accessed on a need-to-know basis. You are prohibited from collecting telemetry data about other users of {% data variables.product.prodname_copilot %} from the {% data variables.product.prodname_copilot %} extension/plugin. For more details about {% data variables.product.prodname_copilot %} telemetry, please see "[About {% data variables.product.prodname_copilot %} telemetry](/github/copilot/about-github-copilot-telemetry)." You may revoke your consent to the telemetry and personal data processing operations described in this paragraph by contacting GitHub and requesting removal from the technical preview.
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
issues, pulls requests, releases, security alerts, or discussions
|
||||
{%- else %}issues, pull requests, releases, or discussions
|
||||
{% endif %}
|
||||
<!-- `else1` statement probably not picked up by GHES 3.1 deprecation script. Will need to review here -->
|
||||
<!-- `else` statement probably not picked up by GHES 3.1 deprecation script. Will need to review here -->
|
||||
@@ -63099,13 +63099,21 @@
|
||||
"nullable": true,
|
||||
"example": "my token",
|
||||
"description": "The note given to the token. This will only be present when the credential is a token."
|
||||
},
|
||||
"authorized_credential_expires_at": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"nullable": true,
|
||||
"description": "The expiry for the token. This will only be present when the credential is a token."
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"login",
|
||||
"credential_id",
|
||||
"credential_type",
|
||||
"credential_authorized_at"
|
||||
"credential_authorized_at",
|
||||
"credential_accessed_at",
|
||||
"authorized_credential_id"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
1867
package-lock.json
generated
1867
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@@ -116,7 +116,7 @@
|
||||
"@types/react-dom": "^17.0.9",
|
||||
"@types/react-syntax-highlighter": "^13.5.2",
|
||||
"@types/uuid": "^8.3.1",
|
||||
"@typescript-eslint/eslint-plugin": "^4.31.1",
|
||||
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
||||
"@typescript-eslint/parser": "^4.31.1",
|
||||
"async": "^3.2.1",
|
||||
"await-sleep": "0.0.1",
|
||||
@@ -140,7 +140,7 @@
|
||||
"eslint-plugin-promise": "^5.1.0",
|
||||
"event-to-promise": "^0.8.0",
|
||||
"glob": "^7.2.0",
|
||||
"graphql": "^15.5.3",
|
||||
"graphql": "^15.6.1",
|
||||
"heroku-client": "^3.1.0",
|
||||
"http-status-code": "^2.1.0",
|
||||
"husky": "^7.0.2",
|
||||
@@ -148,11 +148,11 @@
|
||||
"is-url": "^1.2.4",
|
||||
"japanese-characters": "^1.1.0",
|
||||
"javascript-stringify": "^2.1.0",
|
||||
"jest": "^27.2.0",
|
||||
"jest": "^27.2.5",
|
||||
"jest-github-actions-reporter": "^1.0.3",
|
||||
"jest-slow-test-reporter": "^1.0.0",
|
||||
"linkinator": "^2.14.4",
|
||||
"lint-staged": "^11.2.2",
|
||||
"lint-staged": "^11.2.3",
|
||||
"make-promises-safe": "^5.1.0",
|
||||
"minimatch": "^3.0.4",
|
||||
"mkdirp": "^1.0.4",
|
||||
@@ -162,8 +162,8 @@
|
||||
"nodemon": "^2.0.12",
|
||||
"npm-merge-driver-install": "^2.0.1",
|
||||
"object-hash": "^2.2.0",
|
||||
"postcss": "^8.3.6",
|
||||
"prettier": "^2.4.0",
|
||||
"postcss": "^8.3.9",
|
||||
"prettier": "^2.4.1",
|
||||
"replace": "^1.2.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"robots-parser": "^2.3.0",
|
||||
|
||||
Reference in New Issue
Block a user