Skip to content

Commit

Permalink
feat: POST /repos/{owner}/{repo}/merge-upstream (#364)
Browse files Browse the repository at this point in the history
  • Loading branch information
octokitbot committed Sep 3, 2021
1 parent 96f2b1b commit 8e2eb0f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"description": "Shared TypeScript definitions for Octokit projects",
"dependencies": {
"@octokit/openapi-types": "^10.0.0"
"@octokit/openapi-types": "^10.1.0"
},
"scripts": {
"build": "pika build",
Expand Down Expand Up @@ -96,7 +96,7 @@
]
},
"octokit": {
"openapi-version": "4.0.0"
"openapi-version": "5.1.0"
},
"renovate": {
"extends": [
Expand Down
12 changes: 12 additions & 0 deletions scripts/update-endpoints/generated/endpoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -10698,6 +10698,18 @@
"previews": [],
"renamed": null
},
{
"method": "POST",
"url": "/repos/{owner}/{repo}/merge-upstream",
"documentationUrl": "https://docs.github.com/rest/reference/repos#sync-a-fork-branch-with-the-upstream-repository",
"parameters": [
{ "alias": null, "deprecated": null, "in": "PATH", "name": "owner" },
{ "alias": null, "deprecated": null, "in": "PATH", "name": "repo" },
{ "alias": null, "deprecated": null, "in": "BODY", "name": "branch" }
],
"previews": [],
"renamed": null
},
{
"method": "POST",
"url": "/repos/{owner}/{repo}/hooks/{hook_id}/pings",
Expand Down
7 changes: 7 additions & 0 deletions src/generated/Endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4459,6 +4459,13 @@ export interface Endpoints {
"/repos/{owner}/{repo}/labels",
"post"
>;
/**
* @see https://docs.github.com/rest/reference/repos#sync-a-fork-branch-with-the-upstream-repository
*/
"POST /repos/{owner}/{repo}/merge-upstream": Operation<
"/repos/{owner}/{repo}/merge-upstream",
"post"
>;
/**
* @see https://docs.github.com/rest/reference/repos#merge-a-branch
*/
Expand Down

0 comments on commit 8e2eb0f

Please sign in to comment.