You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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> |
2 years ago | |
|---|---|---|
| .. | ||
| admin | 2 years ago | |
| appstate | 3 years ago | |
| asymkey | 2 years ago | |
| auth | 2 years ago | |
| avatars | 2 years ago | |
| db | 2 years ago | |
| fixtures | 2 years ago | |
| foreignreference | 2 years ago | |
| issues | 2 years ago | |
| migrations | 2 years ago | |
| organization | 2 years ago | |
| packages | 2 years ago | |
| perm | 3 years ago | |
| project | 2 years ago | |
| pull | 2 years ago | |
| repo | 2 years ago | |
| unit | 2 years ago | |
| unittest | 2 years ago | |
| user | 2 years ago | |
| webhook | 2 years ago | |
| access.go | 2 years ago | |
| access_test.go | 2 years ago | |
| action.go | 2 years ago | |
| action_list.go | 2 years ago | |
| action_test.go | 2 years ago | |
| branches.go | 2 years ago | |
| branches_test.go | 2 years ago | |
| commit.go | 2 years ago | |
| commit_status.go | 2 years ago | |
| commit_status_test.go | 3 years ago | |
| consistency.go | 2 years ago | |
| consistency_test.go | 2 years ago | |
| engine_test.go | 3 years ago | |
| error.go | 2 years ago | |
| fixture_generation.go | 3 years ago | |
| fixture_test.go | 3 years ago | |
| helper.go | 2 years ago | |
| helper_directory.go | 3 years ago | |
| helper_environment.go | 2 years ago | |
| issue.go | 2 years ago | |
| issue_assignees.go | 2 years ago | |
| issue_assignees_test.go | 2 years ago | |
| issue_comment.go | 2 years ago | |
| issue_comment_list.go | 2 years ago | |
| issue_comment_test.go | 2 years ago | |
| issue_dependency.go | 2 years ago | |
| issue_dependency_test.go | 2 years ago | |
| issue_label.go | 2 years ago | |
| issue_label_test.go | 2 years ago | |
| issue_list.go | 2 years ago | |
| issue_list_test.go | 3 years ago | |
| issue_lock.go | 2 years ago | |
| issue_project.go | 2 years ago | |
| issue_stopwatch.go | 2 years ago | |
| issue_stopwatch_test.go | 3 years ago | |
| issue_test.go | 2 years ago | |
| issue_tracked_time.go | 2 years ago | |
| issue_tracked_time_test.go | 2 years ago | |
| issue_user.go | 3 years ago | |
| issue_user_test.go | 3 years ago | |
| issue_watch.go | 3 years ago | |
| issue_watch_test.go | 3 years ago | |
| issue_xref.go | 2 years ago | |
| issue_xref_test.go | 2 years ago | |
| lfs.go | 2 years ago | |
| lfs_lock.go | 2 years ago | |
| main_test.go | 2 years ago | |
| migrate.go | 2 years ago | |
| migrate_test.go | 2 years ago | |
| notification.go | 2 years ago | |
| notification_test.go | 3 years ago | |
| org.go | 2 years ago | |
| org_team.go | 2 years ago | |
| org_team_test.go | 2 years ago | |
| org_test.go | 2 years ago | |
| protected_tag.go | 2 years ago | |
| protected_tag_test.go | 3 years ago | |
| pull.go | 2 years ago | |
| pull_list.go | 2 years ago | |
| pull_test.go | 2 years ago | |
| release.go | 2 years ago | |
| repo.go | 2 years ago | |
| repo_activity.go | 2 years ago | |
| repo_collaboration.go | 2 years ago | |
| repo_collaboration_test.go | 3 years ago | |
| repo_generate.go | 2 years ago | |
| repo_generate_test.go | 3 years ago | |
| repo_list.go | 2 years ago | |
| repo_list_test.go | 3 years ago | |
| repo_permission.go | 2 years ago | |
| repo_permission_test.go | 2 years ago | |
| repo_test.go | 2 years ago | |
| repo_transfer.go | 2 years ago | |
| repo_transfer_test.go | 3 years ago | |
| review.go | 2 years ago | |
| review_test.go | 2 years ago | |
| statistic.go | 2 years ago | |
| task.go | 2 years ago | |
| token.go | 2 years ago | |
| token_test.go | 3 years ago | |
| upload.go | 3 years ago | |
| user.go | 2 years ago | |
| user_heatmap.go | 2 years ago | |
| user_heatmap_test.go | 2 years ago | |
| user_test.go | 2 years ago | |
| userlist.go | 2 years ago | |
| userlist_test.go | 2 years ago | |