mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-06-23 02:12:22 +02:00
59b30f060a
* Fix indention Signed-off-by: kolaente <k@knt.li> * Add option to merge a pr right now without waiting for the checks to succeed Signed-off-by: kolaente <k@knt.li> * Fix lint Signed-off-by: kolaente <k@knt.li> * Add scheduled pr merge to tables used for testing Signed-off-by: kolaente <k@knt.li> * Add status param to make GetPullRequestByHeadBranch reusable Signed-off-by: kolaente <k@knt.li> * Move "Merge now" to a seperate button to make the ui clearer Signed-off-by: kolaente <k@knt.li> * Update models/scheduled_pull_request_merge.go Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Re-add migration after merge * Fix frontend lint * Fix version compare * Add vendored dependencies * Add basic tets * Make sure the api route is capable of scheduling PRs for merging * Fix comparing version * make vendor * adopt refactor * apply suggestion: User -> Doer * init var once * Fix Test * Update templates/repo/issue/view_content/comments.tmpl * adopt * nits * next * code format * lint * use same name schema; rm CreateUnScheduledPRToAutoMergeComment * API: can not create schedule twice * Add TestGetBranchNamesForSha * nits * new go routine for each pull to merge * Update models/pull.go Co-authored-by: a1012112796 <1012112796@qq.com> * Update models/scheduled_pull_request_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix & add renaming sugestions * Update services/automerge/pull_auto_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix conflict relicts * apply latest refactors * fix: migration after merge * Update models/error.go Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * adapt latest refactors * fix test * use more context * skip potential edgecases * document func usage * GetBranchNamesForSha() -> GetRefsBySha() * start refactoring * ajust to new changes * nit * docu nit * the great check move * move checks for branchprotection into own package * resolve todo now ... * move & rename * unexport if posible * fix * check if merge is allowed before merge on scheduled pull * debugg * wording * improve SetDefaults & nits * NotAllowedToMerge -> DisallowedToMerge * fix test * merge files * use package "errors" * merge files * add string names * other implementation for gogit * adapt refactor * more context for models/pull.go * GetUserRepoPermission use context * more ctx * use context for loading pull head/base-repo * more ctx * more ctx * models.LoadIssueCtx() * models.LoadIssueCtx() * Handle pull_service.Merge in one DB transaction * add TODOs * next * next * next * more ctx * more ctx * Start refactoring structure of old pull code ... * move code into new packages * shorter names ... and finish **restructure** * Update models/branches.go Co-authored-by: zeripath <art27@cantab.net> * finish UpdateProtectBranch * more and fix * update datum * template: use "svg" helper * rename prQueue 2 prPatchCheckerQueue * handle automerge in queue * lock pull on git&db actions ... * lock pull on git&db actions ... * add TODO notes * the regex * transaction in tests * GetRepositoryByIDCtx * shorter table name and lint fix * close transaction bevore notify * Update models/pull.go * next * CheckPullMergable check all branch protections! * Update routers/web/repo/pull.go * CheckPullMergable check all branch protections! * Revert "PullService lock via pullID (#19520)" (for now...) This reverts commit 6cde7c9159a5ea75a10356feb7b8c7ad4c434a9a. * Update services/pull/check.go * Use for a repo action one database transaction * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * use db.WithTx() * gofmt * make pr.GetDefaultMergeMessage() context aware * make MergePullRequestForm.SetDefaults context aware * use db.WithTx() * pull.SetMerged only with context * fix deadlock in `test-sqlite\#TestAPIBranchProtection` * dont forget templates * db.WithTx allow to set the parentCtx * handle db transaction in service packages but not router * issue_service.ChangeStatus just had caused another deadlock :/ it has to do something with how notification package is handled * if we merge a pull in one database transaktion, we get a lock, because merge infoce internal api that cant handle open db sessions to the same repo * ajust to current master * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * dont open db transaction in router * make generate-swagger * one _success less * wording nit * rm * adapt * remove not needed test files * rm less diff & use attr in JS * ... * Update services/repository/files/commit.go Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * ajust db schema for PullAutoMerge * skip broken pull refs * more context in error messages * remove webUI part for another pull * remove more WebUI only parts * API: add CancleAutoMergePR * Apply suggestions from code review Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * fix lint * Apply suggestions from code review * cancle -> cancel Co-authored-by: delvh <dev.lh@web.de> * change queue identifyer * fix swagger * prevent nil issue * fix and dont drop error * as per @zeripath * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * more declarative integration tests (dedup code) * use assert.False/True helper Co-authored-by: 赵智超 <1012112796@qq.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrations.go | ||
| migrations_test.go | ||
| testlogger_test.go | ||
| v70.go | ||
| v71.go | ||
| v72.go | ||
| v73.go | ||
| v74.go | ||
| v75.go | ||
| v76.go | ||
| v77.go | ||
| v78.go | ||
| v79.go | ||
| v80.go | ||
| v81.go | ||
| v82.go | ||
| v83.go | ||
| v84.go | ||
| v85.go | ||
| v86.go | ||
| v87.go | ||
| v88.go | ||
| v89.go | ||
| v90.go | ||
| v91.go | ||
| v92.go | ||
| v93.go | ||
| v94.go | ||
| v95.go | ||
| v96.go | ||
| v97.go | ||
| v98.go | ||
| v99.go | ||
| v100.go | ||
| v101.go | ||
| v102.go | ||
| v103.go | ||
| v104.go | ||
| v105.go | ||
| v106.go | ||
| v107.go | ||
| v108.go | ||
| v109.go | ||
| v110.go | ||
| v111.go | ||
| v112.go | ||
| v113.go | ||
| v114.go | ||
| v115.go | ||
| v116.go | ||
| v117.go | ||
| v118.go | ||
| v119.go | ||
| v120.go | ||
| v121.go | ||
| v122.go | ||
| v123.go | ||
| v124.go | ||
| v125.go | ||
| v126.go | ||
| v127.go | ||
| v128.go | ||
| v129.go | ||
| v130.go | ||
| v131.go | ||
| v132.go | ||
| v133.go | ||
| v134.go | ||
| v135.go | ||
| v136.go | ||
| v137.go | ||
| v138.go | ||
| v139.go | ||
| v140.go | ||
| v141.go | ||
| v142.go | ||
| v143.go | ||
| v144.go | ||
| v145.go | ||
| v146.go | ||
| v147.go | ||
| v148.go | ||
| v149.go | ||
| v150.go | ||
| v151.go | ||
| v152.go | ||
| v153.go | ||
| v154.go | ||
| v155.go | ||
| v156.go | ||
| v157.go | ||
| v158.go | ||
| v159.go | ||
| v160.go | ||
| v161.go | ||
| v162.go | ||
| v163.go | ||
| v164.go | ||
| v165.go | ||
| v166.go | ||
| v167.go | ||
| v168.go | ||
| v169.go | ||
| v170.go | ||
| v171.go | ||
| v172.go | ||
| v173.go | ||
| v174.go | ||
| v175.go | ||
| v176.go | ||
| v176_test.go | ||
| v177.go | ||
| v177_test.go | ||
| v178.go | ||
| v179.go | ||
| v180.go | ||
| v181.go | ||
| v181_test.go | ||
| v182.go | ||
| v182_test.go | ||
| v183.go | ||
| v184.go | ||
| v185.go | ||
| v186.go | ||
| v187.go | ||
| v188.go | ||
| v189.go | ||
| v189_test.go | ||
| v190.go | ||
| v191.go | ||
| v192.go | ||
| v193.go | ||
| v193_test.go | ||
| v194.go | ||
| v195.go | ||
| v195_test.go | ||
| v196.go | ||
| v197.go | ||
| v198.go | ||
| v199.go | ||
| v200.go | ||
| v201.go | ||
| v202.go | ||
| v203.go | ||
| v204.go | ||
| v205.go | ||
| v206.go | ||
| v207.go | ||
| v208.go | ||
| v209.go | ||
| v210.go | ||
| v210_test.go | ||
| v211.go | ||
| v212.go | ||
| v213.go | ||
| v214.go | ||