8000 Merge branch '5.4' into 6.4 · symfony/filesystem@d761de3 · GitHub
[go: up one dir, main page]
Skip to content
{"payload":{"commit":{"oid":"d761de35c00216df48782755fcbc1b67be1c56e2","url":"/symfony/filesystem/commit/d761de35c00216df48782755fcbc1b67be1c56e2","authoredDate":"2024-09-25T16:18:03.000+02:00","committedDate":"2024-09-25T16:18:03.000+02:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eMerge branch '5.4' into 6.4\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"* 5.4:\n Add PR template and auto-close PR on subtree split repositories","authors":[{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false}],"committerAttribution":false,"committer":{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false},"parents":["f810e3cbdf7fdc35983968523d09f349fa9ada12","af6a59e28b1f4aab9a60bb806c1c9564d564cdcd"],"globalRelayId":"C_kwDOAC-YFtoAKGQ3NjFkZTM1YzAwMjE2ZGY0ODc4Mjc1NWZjYmMxYjY3YmUxYzU2ZTI","sha1":"f810e3cbdf7fdc35983968523d09f349fa9ada12","sha2":"d761de35c00216df48782755fcbc1b67be1c56e2"},"currentUser":null,"repo":{"id":3119126,"defaultBranch":"7.3","name":"filesystem","ownerLogin":"symfony","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2012-01-06T16:19:03.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/143937?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":0,"text":"@@ -1,4 +1,3 @@","html":"@@ -1,4 +1,3 @@","displayNoNewLineWarning":false,"position":0,"left":0,"right":0},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":1,"text":" /Tests export-ignore","html":" /\u003cspan class=\"pl-e\"\u003eTests\u003c/span\u003e \u003cspan class=\"pl-v\"\u003eexport-ignore\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":1,"right":1},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":2,"text":" /phpunit.xml.dist export-ignore","html":" /\u003cspan class=\"pl-e\"\u003ephpunit.xml.dist\u003c/span\u003e \u003cspan class=\"pl-v\"\u003eexport-ignore\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":2,"right":2},{"stylingDirective":null,"type":"DELETION","blobLineNumber":3,"text":"-/.gitattributes export-ignore","html":"-/\u003cspan class=\"pl-e\"\u003e.gitattributes\u003c/span\u003e \u003cspan class=\"pl-v\"\u003eexport-ignore\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":3,"right":2},{"stylingDirective":null,"type":"DELETION","blobLineNumber":4,"text":"-/.gitignore export-ignore","html":"-/\u003cspan class=\"pl-e\"\u003e.gitignore\u003c/span\u003e \u003cspan class=\"pl-v\"\u003eexport-ignore\u003c/span\u003e","displayNoNewLineWarning":false,"position":4,"left":4,"right":2},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3,"text":"+/.git* export-ignore","html":"+/\u003cspan class=\"pl-e\"\u003e.git\u003c/span\u003e\u003cspan class=\"pl-k\"\u003e*\u003c/span\u003e \u003cspan class=\"pl-v\"\u003eexport-ignore\u003c/span\u003e","displayNoNewLineWarning":false,"position":5,"left":4,"right":3}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":3,"linesChanged":3,"newTreeEntry":{"lineCount":3,"path":".gitattributes","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":".gitattributes","mode":100644},"linesAdded":1,"linesDeleted":2,"path":".gitattributes","pathDigest":"618cd5b83d62060ba3d027e314a21ceaf75d36067ff820db126642944145393e","status":"MODIFIED","truncatedReason":null,"oldOid":"f810e3cbdf7fdc35983968523d09f349fa9ada12","newOid":"d761de35c00216df48782755fcbc1b67be1c56e2","copilotChatReference":null,"deletedSha":"f810e3cbdf7fdc35983968523d09f349fa9ada12","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":0,"text":"@@ -0,0 +1,8 @@","html":"@@ -0,0 +1,8 @@","displayNoNewLineWarning":false,"position":0,"left":null,"right":0},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":1,"text":"+Please do not submit any Pull Requests here. They will be closed.","html":"+Please do not submit any Pull Requests here. They will be closed.","displayNoNewLineWarning":false,"position":1,"left":null,"right":1},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":2,"text":"+---","html":"+\u003cspan class=\"pl-ms\"\u003e---\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":null,"right":2},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3,"text":"+","html":"+","displayNoNewLineWarning":false,"position":3,"left":null,"right":3},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":4,"text":"+Please submit your PR here instead:","html":"+Please submit your PR here instead:","displayNoNewLineWarning":false,"position":4,"left":null,"right":4},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":5,"text":"+https://github.com/symfony/symfony","html":"+\u003cspan class=\"pl-corl\"\u003ehttps://github.com/symfony/symfony\u003c/span\u003e","displayNoNewLineWarning":false,"position":5,"left":null,"right":5},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":6,"text":"+","html":"+","displayNoNewLineWarning":false,"position":6,"left":null,"right":6},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":7,"text":"+This repository is what we call a \"subtree split\": a read-only subset of that main repository.","html":"+This repository is what we call a \u0026quot;subtree split\u0026quot;: a read-only subset of that main repository.","displayNoNewLineWarning":false,"position":7,"left":null,"right":7},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":8,"text":"+We're looking forward to your PR there!","html":"+We\u0026#39;re looking forward to your PR there!","displayNoNewLineWarning":false,"position":8,"left":null,"right":8}],"diffNumber":1,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":8,"linesChanged":8,"newTreeEntry":{"lineCount":8,"path":".github/PULL_REQUEST_TEMPLATE.md","mode":100644,"isGenerated":false},"oldTreeEntry":null,"linesAdded":8,"linesDeleted":0,"path":".github/PULL_REQUEST_TEMPLATE.md","pathDigest":"18813c86948efc57e661623d7ba48ff94325c9b5421ec9177f724922dd553a35","status":"ADDED","truncatedReason":null,"oldOid":"f810e3cbdf7fdc35983968523d09f349fa9ada12","newOid":"d761de35c00216df48782755fcbc1b67be1c56e2","copilotChatReference":null,"deletedSha":"f810e3cbdf7fdc35983968523d09f349fa9ada12","canToggleRichDiff":true,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":0,"text":"@@ -0,0 +1,20 @@","html":"@@ -0,0 +1,20 @@","displayNoNewLineWarning":false,"position":0,"left":null,"right":0},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":1,"text":"+name: Close Pull Request","html":"+\u003cspan class=\"pl-ent\"\u003ename\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003eClose Pull Request\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":null,"right":1},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":2,"text":"+","html":"+","displayNoNewLineWarning":false,"position":2,"left":null,"right":2},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":3,"text":"+on:","html":"+\u003cspan class=\"pl-ent\"\u003eon\u003c/span\u003e:","displayNoNewLineWarning":false,"position":3,"left":null,"right":3},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":4,"text":"+ pull_request_target:","html":"+ \u003cspan class=\"pl-ent\"\u003epull_request_target\u003c/span\u003e:","displayNoNewLineWarning":false,"position":4,"left":null,"right":4},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":5,"text":"+ types: [opened]","html":"+ \u003cspan class=\"pl-ent\"\u003etypes\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003e[opened]\u003c/span\u003e","displayNoNewLineWarning":false,"position":5,"left":null,"right":5},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":6,"text":"+","html":"+","displayNoNewLineWarning":false,"position":6,"left":null,"right":6},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":7,"text":"+jobs:","html":"+\u003cspan class=\"pl-ent\"\u003ejobs\u003c/span\u003e:","displayNoNewLineWarning":false,"position":7,"left":null,"right":7},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":8,"text":"+ run:","html":"+ \u003cspan class=\"pl-ent\"\u003erun\u003c/span\u003e:","displayNoNewLineWarning":false,"position":8,"left":null,"right":8},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":9,"text":"+ runs-on: ubuntu-latest","html":"+ \u003cspan class=\"pl-ent\"\u003eruns-on\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003eubuntu-latest\u003c/span\u003e","displayNoNewLineWarning":false,"position":9,"left":null,"right":9},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":10,"text":"+ steps:","html":"+ \u003cspan class=\"pl-ent\"\u003esteps\u003c/span\u003e:","displayNoNewLineWarning":false,"position":10,"left":null,"right":10},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":11,"text":"+ - uses: superbrothers/close-pull-request@v3","html":"+ - \u003cspan class=\"pl-ent\"\u003euses\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003esuperbrothers/close-pull-request@v3\u003c/span\u003e","displayNoNewLineWarning":false,"position":11,"left":null,"right":11},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":12,"text":"+ with:","html":"+ \u003cspan class=\"pl-ent\"\u003ewith\u003c/span\u003e:","displayNoNewLineWarning":false,"position":12,"left":null,"right":12},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":13,"text":"+ comment: |","html":"+ \u003cspan class=\"pl-ent\"\u003ecomment\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003e|\u003c/span\u003e","displayNoNewLineWarning":false,"position":13,"left":null,"right":13},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":14,"text":"+ Thanks for your Pull Request! We love contributions.","html":"+\u003cspan class=\"pl-s\"\u003e Thanks for your Pull Request! We love contributions.\u003c/span\u003e","displayNoNewLineWarning":false,"position":14,"left":null,"right":14},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":15,"text":"+","html":"+\u003cspan class=\"pl-s\"\u003e\u003c/span\u003e","displayNoNewLineWarning":false,"position":15,"left":null,"right":15},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":16,"text":"+ However, you should instead open your PR on the main repository:","html":"+\u003cspan class=\"pl-s\"\u003e However, you should instead open your PR on the main repository:\u003c/span\u003e","displayNoNewLineWarning":false,"position":16,"left":null,"right":16},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":17,"text":"+ https://github.com/symfony/symfony","html":"+\u003cspan class=\"pl-s\"\u003e https://github.com/symfony/symfony\u003c/span\u003e","displayNoNewLineWarning":false,"position":17,"left":null,"right":17},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":18,"text":"+","html":"+\u003cspan class=\"pl-s\"\u003e\u003c/span\u003e","displayNoNewLineWarning":false,"position":18,"left":null,"right":18},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":19,"text":"+ This repository is what we call a \"subtree split\": a read-only subset of that main repository.","html":"+\u003cspan class=\"pl-s\"\u003e This repository is what we call a \u0026quot;subtree split\u0026quot;: a read-only subset of that main repository.\u003c/span\u003e","displayNoNewLineWarning":false,"position":19,"left":null,"right":19},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":20,"text":"+ We're looking forward to your PR there!","html":"+\u003cspan class=\"pl-s\"\u003e We\u0026#39;re looking forward to your PR there!\u003c/span\u003e","displayNoNewLineWarning":false,"position":20,"left":null,"right":20}],"diffNumber":2,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":20,"linesChanged":20,"newTreeEntry":{"lineCount":20,"path":".github/workflows/close-pull-request.yml","mode":100644,"isGenerated":false},"oldTreeEntry":null,"linesAdded":20,"linesDeleted":0,"path":".github/workflows/close-pull-request.yml","pathDigest":"72570cb92186cb5797be12d9e46fa14d1adc97c584b3da369a8207d22179666c","status":"ADDED","truncatedReason":null,"oldOid":"f810e3cbdf7fdc35983968523d09f349fa9ada12","newOid":"d761de35c00216df48782755fcbc1b67be1c56e2","copilotChatReference":null,"deletedSha":"f810e3cbdf7fdc35983968523d09f349fa9ada12","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/symfony/filesystem/commit/d761de35c00216df48782755fcbc1b67be1c56e2","fileTreeExpanded":true,"headerInfo":{"additions":29,"deletions":2,"filesChanged":3,"filesChangedString":"3"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":3,"truncated":false,"byteCount":1031,"lineShownCount":36},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"VSy-GVxslhwpWynX0ZLMDGMTLqHUFKz9olB9lQChYL-n14s34V_h492j6yf5DPKFDXlyxCBsT8QfTyNx4ATTow"},"/users/diffview?diff=unified":{"post":"egJsy0MWvHFMkxkwLnDoUGahUsuKfBKPcI6ezhfAyfaI-Vnl_iXLjrhr28AG7tbZCMsOrn4E8bbNkcAq92V66g"},"/notifications/thread":{"post":"7W2vsVX7LfJhf1-GqaJ2coIdpMabXNi6frfCji3_GqbuTdnIs8d5gASXt86XKTuryVxzZvKnugGYzr_rsnRZhQ"}}},"title":"Merge branch '5.4' into 6.4 · symfony/filesystem@d761de3","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-6dcb06aa9fad.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"diff_ux_refresh_ssr_five":false,"diff_ux_refresh_ssr_ten":false}}}

Commit d761de3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.4
* 5.4: Add PR template and auto-close PR on subtree split repositories
2 parents f810e3c + af6a59e commit d761de3

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

‎.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/Tests export-ignore
22
/phpunit.xml.dist export-ignore
3-
/.gitattributes export-ignore
4-
/.gitignore export-ignore
3+
/.git* export-ignore

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Please do not submit any Pull Requests here. They will be closed.
2+
---
3+
4+
Please submit your PR here instead:
5+
https://github.com/symfony/symfony
6+
7+
This repository is what we call a "subtree split": a read-only subset of that main repository.
8+
We're looking forward to your PR there!

‎.github/workflows/close-pull-request.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Close Pull Request
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: superbrothers/close-pull-request@v3
12+
with:
13+
comment: |
14+
Thanks for your Pull Request! We love contributions.
15+
16+
However, you should instead open your PR on the main repository:
17+
https://github.com/symfony/symfony
18+
19+
This repository is what we call a "subtree split": a read-only subset of that main repository.
20+
We're looking forward to your PR there!

0 commit comments

Comments
 (0)
0