Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
987cd277f6
gitea/models
History
6543 c95d9603ea
Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 
* 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

* 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

move check pr after merge

* Remove unnecessary prepareTestEnv - onGiteaRun does this for us

* Add information about when merging occuring

* More logging

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

* re order

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
2020-02-10 13:09:08 +00:00
..
fixtures Only serve attachments when linked to issue/release and if accessible by user (#9340) 2020-01-05 01:20:08 +02:00
migrations Add branch protection option to block merge on requested changes. (#9592) 2020-01-03 19:47:09 +02:00
access_test.go
access.go
action_list.go
action_test.go Move UpdateIssuesCommit from models to repofiles (#9276) 2019-12-07 23:52:36 +08:00
action.go Ensure that feeds are appropriately restricted (#10018) (#10019) 2020-01-28 23:54:09 +02:00
admin_test.go
admin.go
attachment_test.go Only serve attachments when linked to issue/release and if accessible by user (#9340) 2020-01-05 01:20:08 +02:00
attachment.go Only serve attachments when linked to issue/release and if accessible by user (#9340) 2020-01-05 01:20:08 +02:00
branches_test.go
branches.go Add branch protection option to block merge on requested changes. (#9592) 2020-01-03 19:47:09 +02:00
commit_status_test.go Fix wrong hint when status checking is running on pull request view (#9886) (#9928) 2020-01-22 08:06:11 +02:00
commit_status.go Fix wrong hint when status checking is running on pull request view (#9886) (#9928) 2020-01-22 08:06:11 +02:00
consistency.go Auto-subscribe user to repository when they commit/tag to it (#7657) 2019-11-10 09:22:19 +00:00
context.go
convert.go
error_oauth2.go
error.go [API] Fix 9544 | return 200 when reaction already exist (#9550) 2019-12-31 03:21:21 -05:00
external_login_user.go
gpg_key_test.go
gpg_key.go
helper_directory.go Remove SavePatch and generate patches on the fly (#9302) 2019-12-13 23:21:06 +01:00
helper_environment.go Properly enforce gitea environment for pushes (#9501) 2019-12-27 21:15:04 +00:00
helper.go
issue_assignees_test.go Fix API Bug (fail on empty assignees) (#8873) 2019-11-10 16:07:21 +08:00
issue_assignees.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_comment_list.go Fixed repo link in generated comment for cross repository dependency (#9863) (#9935) 2020-01-22 12:54:40 +02:00
issue_comment_test.go
issue_comment.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_dependency_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
issue_dependency.go
issue_label_test.go
issue_label.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_list_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_list.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_lock.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_milestone_test.go Fix milestone API state parameter unhandled (#10049) (#10052) 2020-01-29 18:01:44 +02:00
issue_milestone.go Fix milestone API state parameter unhandled (#10049) (#10052) 2020-01-29 18:01:44 +02:00
issue_reaction_test.go [API] Fix 9544 | return 200 when reaction already exist (#9550) 2019-12-31 03:21:21 -05:00
issue_reaction.go [API] Fix 9544 | return 200 when reaction already exist (#9550) 2019-12-31 03:21:21 -05:00
issue_stopwatch_test.go
issue_stopwatch.go [API] extend StopWatch (#9196) 2019-12-11 23:23:05 -05:00
issue_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_tracked_time_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_tracked_time.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_user_test.go
issue_user.go
issue_watch_test.go Fix Issue Unsubscription (#9634) 2020-01-07 15:41:35 +00:00
issue_watch.go Fix Issue Unsubscription (#9634) 2020-01-07 15:41:35 +00:00
issue_xref_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
issue_xref.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue.go Fix wrong identify poster on a migrated pull request when submi… (#9827) (#9830) 2020-01-17 13:38:11 +01:00
lfs_lock.go Make repository management section handle lfs locks (#8726) 2019-12-12 21:18:07 +08:00
lfs.go
log.go
login_source.go Do not try to recreate ldap user if they are already created (#9900) (#9919) 2020-01-21 21:17:00 +01:00
main_test.go
migrate.go
models_test.go
models.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
notification_test.go Improve notification (#8835) 2019-11-12 16:33:34 +08:00
notification.go Fix notification page panic (#9337) 2019-12-13 03:08:34 +01:00
oauth2_application_test.go
oauth2_application.go
oauth2.go
org_team_test.go Add team option to grant rights for all organization repositories (#8688) 2019-11-06 11:37:14 +02:00
org_team.go Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055) 2019-12-03 20:08:56 -05:00
org_test.go Only show part of members on orgnization dashboard and add paging for orgnization members page (#9092) 2019-12-06 13:34:54 +08:00
org.go Only show part of members on orgnization dashboard and add paging for orgnization members page (#9092) 2019-12-06 13:34:54 +08:00
pull_list.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
pull_sign.go Sign protected branches (#8993) 2019-12-15 11:06:31 +00:00
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 2019-12-15 04:28:51 +01:00
pull.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 2020-02-10 13:09:08 +00:00
release.go Move some repository methods from models to modules/repository (#9353) 2019-12-14 18:30:01 +01:00
repo_activity.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo_branch.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo_collaboration_test.go
repo_collaboration.go Team permission to create repository in organization (#8312) 2019-11-20 19:27:49 +08:00
repo_generate_test.go Variable expansion in repository templates (#9163) 2019-11-30 01:54:47 -05:00
repo_generate.go Fix nil reference in repo generation (#9660) (#9666) 2020-01-09 16:50:21 +00:00
repo_indexer.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
repo_issue.go
repo_list_test.go [BugFix] Hide public repos owned by private orgs (#9609) 2020-01-05 18:48:47 +00:00
repo_list.go Ensure that feeds are appropriately restricted (#10018) (#10019) 2020-01-28 23:54:09 +02:00
repo_mirror.go Move some repository methods from models to modules/repository (#9353) 2019-12-14 18:30:01 +01:00
repo_permission_test.go
repo_permission.go Fix access issues on milestone and issue overview pages. (#9603) 2020-01-04 20:23:29 -05:00
repo_redirect_test.go Move repoWorkPool outside rename/transfer repository (#9086) 2019-12-06 12:00:50 +08:00
repo_redirect.go Move repoWorkPool outside rename/transfer repository (#9086) 2019-12-06 12:00:50 +08:00
repo_sign.go Sign protected branches (#8993) 2019-12-15 11:06:31 +00:00
repo_test.go Fix team links in HTML rendering (#9127) 2019-11-24 11:34:44 -05:00
repo_unit.go
repo_watch_test.go Auto-subscribe user to repository when they commit/tag to it (#7657) 2019-11-10 09:22:19 +00:00
repo_watch.go Batch hook pre- and post-receive calls (#8602) 2019-12-26 13:29:45 +02:00
repo.go Update topics repo count when deleting repository (#10081) 2020-01-31 08:04:49 +00:00
review_test.go Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055) 2019-12-03 20:08:56 -05:00
review.go Provide Default messages for merges (#9393) 2019-12-30 18:34:11 -05:00
ssh_key_test.go Fix SSH2 conditonal in key parsing code (#8806) 2019-11-03 19:08:18 +08:00
ssh_key.go Fix SSH2 conditonal in key parsing code (#8806) 2019-11-03 19:08:18 +08:00
star_test.go
star.go
task.go Hide given credentials for migrated repos. (#9097) 2019-11-20 13:01:09 -05:00
test_fixtures.go Testing: Update postgres sequences (#9304) 2019-12-10 07:49:05 +00:00
token_test.go
token.go
topic_test.go
topic.go Update topics repo count when deleting repository (#10081) 2020-01-31 08:04:49 +00:00
twofactor.go
u2f_test.go
u2f.go
unit_tests.go
unit.go
update_test.go
update.go Properly enforce gitea environment for pushes (#9501) 2019-12-27 21:15:04 +00:00
upload.go
user_follow_test.go
user_follow.go
user_heatmap_test.go
user_heatmap.go
user_mail_test.go
user_mail.go
user_openid_test.go
user_openid.go
user_test.go Team permission to create repository in organization (#8312) 2019-11-20 19:27:49 +08:00
user.go Add option to prevent LDAP from deactivating everything on empty search (#9879) (#9896) 2020-01-20 21:18:23 +02:00
userlist_test.go Team permission to create repository in organization (#8312) 2019-11-20 19:27:49 +08:00
userlist.go Add API for Issue set Subscription (#8729) 2019-11-02 23:27:49 +08:00
webhook_test.go Move more webhook codes from models to webhook module (#8802) 2019-11-03 22:13:25 +00:00
webhook.go Move more webhook codes from models to webhook module (#8802) 2019-11-03 22:13:25 +00:00
wiki_test.go Move wiki related funtions from models to services/wiki (#9355) 2020-01-07 18:27:36 +00:00
wiki.go Move wiki related funtions from models to services/wiki (#9355) 2020-01-07 18:27:36 +00:00