gitea

History

zeripath 875c5e1305 Only check for conflicts/merging if the PR has not been merged in the interim (#10132 ) * 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>		2020-02-10 01:09:31 +02:00
..
fixtures	…
migrations	Remove migration support from versions earlier than 1.6.0 (#10026 )	2020-01-31 21:42:45 +08:00
access.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
access_test.go	…
action.go	Ensure that feeds are appropriately restricted (#10018 )	2020-01-28 11:39:37 +00:00
action_list.go	…
action_test.go	…
admin.go	…
admin_test.go	…
attachment.go	…
attachment_test.go	…
branches.go	…
branches_test.go	…
commit_status.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
commit_status_test.go	Fix wrong hint when status checking is running on pull request view (#9886 )	2020-01-22 11:46:04 +08:00
consistency.go	…
context.go	Refactor repository check and sync functions (#9854 )	2020-01-20 20:01:19 +00:00
convert.go	…
error.go	Add require signed commit for protected branch (#9708 )	2020-01-15 09:32:57 +01:00
error_oauth2.go	…
external_login_user.go	Migrate reviews when migrating repository from github (#9463 )	2020-01-23 19:28:15 +02:00
gpg_key.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
gpg_key_test.go	…
helper.go	…
helper_directory.go	…
helper_environment.go	Move PushUpdateAddDeleteTags to repository module from models (#10106 )	2020-02-03 09:47:04 +01:00
issue.go	[API] expose RepoOwner on Issue responce (#10126 )	2020-02-04 00:05:17 -05:00
issue_assignees.go	…
issue_assignees_test.go	…
issue_comment.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_comment_list.go	Fixed repo link in generated comment for cross repository dependency (#9863 )	2020-01-21 10:18:52 +00:00
issue_comment_test.go	…
issue_dependency.go	…
issue_dependency_test.go	…
issue_label.go	[API] Fix inconsistent label color format (#10129 )	2020-02-09 14:33:03 +00:00
issue_label_test.go	[API] Fix inconsistent label color format (#10129 )	2020-02-09 14:33:03 +00:00
issue_list.go	…
issue_list_test.go	…
issue_lock.go	…
issue_milestone.go	Fix milestone API state parameter unhandled (#10049 )	2020-01-29 08:36:32 +02:00
issue_milestone_test.go	Fix milestone API state parameter unhandled (#10049 )	2020-01-29 08:36:32 +02:00
issue_reaction.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_reaction_test.go	…
issue_stopwatch.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_stopwatch_test.go	…
issue_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_tracked_time.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_tracked_time_test.go	…
issue_user.go	…
issue_user_test.go	…
issue_watch.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_watch_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
issue_xref.go	…
issue_xref_test.go	…
lfs.go	…
lfs_lock.go	…
list_options.go	Fix wrong paging on org members (#9990 )	2020-01-26 15:32:53 +08:00
log.go	…
login_source.go	Do not try to recreate ldap user if they are already created (#9900 )	2020-01-21 18:49:30 +00:00
main_test.go	…
migrate.go	Migrate reviews when migrating repository from github (#9463 )	2020-01-23 19:28:15 +02:00
models.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
models_test.go	…
notification.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
notification_test.go	…
oauth2.go	…
oauth2_application.go	…
oauth2_application_test.go	…
org.go	Ensure DeleteUser is not allowed to Delete Orgs and visa versa (#10134 )	2020-02-04 16:27:18 +02:00
org_team.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
org_team_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
org_test.go	Ensure DeleteUser is not allowed to Delete Orgs and visa versa (#10134 )	2020-02-04 16:27:18 +02:00
pull.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132 )	2020-02-10 01:09:31 +02:00
pull_list.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
pull_sign.go	Sign: Handle ErrTwoFactorNotEnrolled correctly (#10008 )	2020-01-26 23:44:12 +00:00
pull_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
release.go	Move PushUpdateAddDeleteTags to repository module from models (#10106 )	2020-02-03 09:47:04 +01:00
repo.go	Update topics repo count when deleting repository (#10051 )	2020-01-31 08:57:19 +02:00
repo_activity.go	Add top author stats to activity page (#9615 )	2020-01-20 12:07:30 +02:00
repo_branch.go	…
repo_collaboration.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
repo_collaboration_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
repo_generate.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
repo_generate_test.go	…
repo_indexer.go	…
repo_issue.go	…
repo_list.go	Ensure that feeds are appropriately restricted (#10018 )	2020-01-28 11:39:37 +00:00
repo_list_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
repo_mirror.go	…
repo_permission.go	…
repo_permission_test.go	…
repo_redirect.go	…
repo_redirect_test.go	…
repo_sign.go	Sign: Handle ErrTwoFactorNotEnrolled correctly (#10008 )	2020-01-26 23:44:12 +00:00
repo_test.go	…
repo_unit.go	Add setting to set default and global disabled repository units. (#8788 )	2020-01-17 09:34:37 +02:00
repo_watch.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
repo_watch_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
review.go	Migrate reviews when migrating repository from github (#9463 )	2020-01-23 19:28:15 +02:00
review_test.go	…
ssh_key.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
ssh_key_test.go	…
star.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
star_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
task.go	…
test_fixtures.go	…
token.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
token_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
topic.go	Update topics repo count when deleting repository (#10051 )	2020-01-31 08:57:19 +02:00
topic_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
twofactor.go	…
u2f.go	…
u2f_test.go	…
unit.go	Add setting to set default and global disabled repository units. (#8788 )	2020-01-17 09:34:37 +02:00
unit_tests.go	…
update.go	Move PushUpdateAddDeleteTags to repository module from models (#10106 )	2020-02-03 09:47:04 +01:00
upload.go	…
user.go	[API] Fix inconsistent label color format (#10129 )	2020-02-09 14:33:03 +00:00
user_follow.go	…
user_follow_test.go	…
user_heatmap.go	…
user_heatmap_test.go	…
user_mail.go	…
user_mail_test.go	…
user_openid.go	…
user_openid_test.go	…
user_test.go	Ensure DeleteUser is not allowed to Delete Orgs and visa versa (#10134 )	2020-02-04 16:27:18 +02:00
userlist.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
userlist_test.go	…
webhook.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
webhook_test.go	API add/generalize pagination (#9452 )	2020-01-24 14:00:29 -05:00
wiki.go	…
wiki_test.go	…