mirror of https://github.com/go-gitea/gitea.git
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.
875c5e1305
* Only check for merging if the PR has not been merged in the interim * fixup! Only check for merging if the PR has not been merged in the interim * Try to fix test failure * Use PR2 not PR1 in tests as PR1 merges automatically * return already merged error * enforce locking * enforce locking - fix-test * enforce locking - fix-testx2 * enforce locking - fix-testx3 * move pullrequest checking to after merge This might improve the chance that the race does not affect us but does not prevent it. * Remove minor race with getting merge commit id * fixup * move check pr after merge * Remove unnecessary prepareTestEnv - onGiteaRun does this for us * Add information about when merging occuring * fix fmt * More logging * Attempt to fix mysql * Try MySQL fix again * try again * Try again?! * Try again?! * Sigh * remove the count - perhaps that will help * next remove the update id * next remove the update id - make it updated_unix instead * On failure to merge ensure that the pr is rechecked for conflict errors * On failure to merge ensure that the pr is rechecked for conflict errors * Update models/pull.go * Update models/pull.go Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> |
5 years ago | |
|---|---|---|
| .. | ||
| fixtures | 5 years ago | |
| migrations | 5 years ago | |
| access.go | 5 years ago | |
| access_test.go | 5 years ago | |
| action.go | 5 years ago | |
| action_list.go | 7 years ago | |
| action_test.go | 5 years ago | |
| admin.go | 6 years ago | |
| admin_test.go | 8 years ago | |
| attachment.go | 5 years ago | |
| attachment_test.go | 5 years ago | |
| branches.go | 5 years ago | |
| branches_test.go | 7 years ago | |
| commit_status.go | 5 years ago | |
| commit_status_test.go | 5 years ago | |
| consistency.go | 5 years ago | |
| context.go | 5 years ago | |
| convert.go | 6 years ago | |
| error.go | 5 years ago | |
| error_oauth2.go | 8 years ago | |
| external_login_user.go | 5 years ago | |
| gpg_key.go | 5 years ago | |
| gpg_key_test.go | 6 years ago | |
| helper.go | 7 years ago | |
| helper_directory.go | 5 years ago | |
| helper_environment.go | 5 years ago | |
| issue.go | 5 years ago | |
| issue_assignees.go | 5 years ago | |
| issue_assignees_test.go | 5 years ago | |
| issue_comment.go | 5 years ago | |
| issue_comment_list.go | 5 years ago | |
| issue_comment_test.go | 7 years ago | |
| issue_dependency.go | 6 years ago | |
| issue_dependency_test.go | 5 years ago | |
| issue_label.go | 5 years ago | |
| issue_label_test.go | 5 years ago | |
| issue_list.go | 5 years ago | |
| issue_list_test.go | 5 years ago | |
| issue_lock.go | 5 years ago | |
| issue_milestone.go | 5 years ago | |
| issue_milestone_test.go | 5 years ago | |
| issue_reaction.go | 5 years ago | |
| issue_reaction_test.go | 5 years ago | |
| issue_stopwatch.go | 5 years ago | |
| issue_stopwatch_test.go | 6 years ago | |
| issue_test.go | 5 years ago | |
| issue_tracked_time.go | 5 years ago | |
| issue_tracked_time_test.go | 5 years ago | |
| issue_user.go | 5 years ago | |
| issue_user_test.go | 5 years ago | |
| issue_watch.go | 5 years ago | |
| issue_watch_test.go | 5 years ago | |
| issue_xref.go | 5 years ago | |
| issue_xref_test.go | 5 years ago | |
| lfs.go | 5 years ago | |
| lfs_lock.go | 5 years ago | |
| list_options.go | 5 years ago | |
| log.go | 6 years ago | |
| login_source.go | 5 years ago | |
| main_test.go | 7 years ago | |
| migrate.go | 5 years ago | |
| models.go | 5 years ago | |
| models_test.go | 6 years ago | |
| notification.go | 5 years ago | |
| notification_test.go | 5 years ago | |
| oauth2.go | 5 years ago | |
| oauth2_application.go | 5 years ago | |
| oauth2_application_test.go | 6 years ago | |
| org.go | 5 years ago | |
| org_team.go | 5 years ago | |
| org_team_test.go | 5 years ago | |
| org_test.go | 5 years ago | |
| pull.go | 5 years ago | |
| pull_list.go | 5 years ago | |
| pull_sign.go | 5 years ago | |
| pull_test.go | 5 years ago | |
| release.go | 5 years ago | |
| repo.go | 5 years ago | |
| repo_activity.go | 5 years ago | |
| repo_branch.go | 5 years ago | |
| repo_collaboration.go | 5 years ago | |
| repo_collaboration_test.go | 5 years ago | |
| repo_generate.go | 5 years ago | |
| repo_generate_test.go | 5 years ago | |
| repo_indexer.go | 5 years ago | |
| repo_issue.go | 7 years ago | |
| repo_list.go | 5 years ago | |
| repo_list_test.go | 5 years ago | |
| repo_mirror.go | 5 years ago | |
| repo_permission.go | 5 years ago | |
| repo_permission_test.go | 6 years ago | |
| repo_redirect.go | 5 years ago | |
| repo_redirect_test.go | 5 years ago | |
| repo_sign.go | 5 years ago | |
| repo_test.go | 5 years ago | |
| repo_unit.go | 5 years ago | |
| repo_watch.go | 5 years ago | |
| repo_watch_test.go | 5 years ago | |
| review.go | 5 years ago | |
| review_test.go | 5 years ago | |
| ssh_key.go | 5 years ago | |
| ssh_key_test.go | 5 years ago | |
| star.go | 5 years ago | |
| star_test.go | 5 years ago | |
| task.go | 5 years ago | |
| test_fixtures.go | 5 years ago | |
| token.go | 5 years ago | |
| token_test.go | 5 years ago | |
| topic.go | 5 years ago | |
| topic_test.go | 5 years ago | |
| twofactor.go | 6 years ago | |
| u2f.go | 6 years ago | |
| u2f_test.go | 6 years ago | |
| unit.go | 5 years ago | |
| unit_tests.go | 5 years ago | |
| update.go | 5 years ago | |
| upload.go | 6 years ago | |
| user.go | 5 years ago | |
| user_follow.go | 8 years ago | |
| user_follow_test.go | 8 years ago | |
| user_heatmap.go | 6 years ago | |
| user_heatmap_test.go | 5 years ago | |
| user_mail.go | 6 years ago | |
| user_mail_test.go | 8 years ago | |
| user_openid.go | 6 years ago | |
| user_openid_test.go | 6 years ago | |
| user_test.go | 5 years ago | |
| userlist.go | 5 years ago | |
| userlist_test.go | 5 years ago | |
| webhook.go | 5 years ago | |
| webhook_test.go | 5 years ago | |
| wiki.go | 5 years ago | |
| wiki_test.go | 5 years ago | |