core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
gitea/models
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 Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
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 Restricted users (#6274) 2020-01-13 18:33:46 +01:00
action.go Ensure that feeds are appropriately restricted (#10018) 2020-01-28 11:39:37 +00:00
action_list.go refactor: reduce sql query in retrieveFeeds (#3547) 2018-02-21 18:55:34 +08:00
action_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
admin.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
admin_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03: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
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
branches.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
branches_test.go Add deleted_branch table fixture (#2832) 2017-11-04 15:31:59 +02:00
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 Auto-subscribe user to repository when they commit/tag to it (#7657) 2019-11-10 09:22:19 +00:00
context.go Refactor repository check and sync functions (#9854) 2020-01-20 20:01:19 +00:00
convert.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
error.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
error_oauth2.go gofmt (#1662) 2017-05-04 13:54:56 +08:00
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 Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
helper.go Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
helper_directory.go Remove SavePatch and generate patches on the fly (#9302) 2019-12-13 23:21:06 +01:00
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 remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_assignees_test.go Fix API Bug (fail on empty assignees) (#8873) 2019-11-10 16:07:21 +08:00
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 Pull request review/approval and comment on code (#3748) 2018-08-06 06:43:21 +02:00
issue_dependency.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_dependency_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
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 [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_list_test.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.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 Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
issue_stopwatch.go API add/generalize pagination (#9452) 2020-01-24 14:00:29 -05:00
issue_stopwatch_test.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
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 [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_user.go Mail assignee when issue/pull request is assigned (#8546) 2019-10-25 22:46:37 +08:00
issue_user_test.go Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
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 remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_xref_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
lfs.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
lfs_lock.go Make repository management section handle lfs locks (#8726) 2019-12-12 21:18:07 +08:00
list_options.go Fix wrong paging on org members (#9990) 2020-01-26 15:32:53 +08:00
log.go Fix error log when loading issues caused by a xorm bug (#7271) 2019-06-23 18:22:43 +03:00
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 Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
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 Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
notification.go API add/generalize pagination (#9452) 2020-01-24 14:00:29 -05:00
notification_test.go [API] Add notification endpoint (#9488) 2020-01-09 11:56:32 +00:00
oauth2.go migrate gplus to google oauth2 provider (#7885) 2019-09-14 12:02:39 +02:00
oauth2_application.go Upgrade xorm to v0.8.0 (#8536) 2019-10-17 11:26:49 +02:00
oauth2_application_test.go OAuth2 Grant UI (#6625) 2019-04-17 16:18:16 +08:00
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 Move newbranch to standalone package (#9627) 2020-01-14 11:38:04 +08:00
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 Variable expansion in repository templates (#9163) 2019-11-30 01:54:47 -05:00
repo_indexer.go Add owner_name column for table repository for maintaince reason (#9717) 2020-01-12 17:36:21 +08:00
repo_issue.go Add EnableTimetracking option to app settings (#3719) 2018-04-09 23:15:32 +08:00
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 Move some repository methods from models to modules/repository (#9353) 2019-12-14 18:30:01 +01:00
repo_permission.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
repo_permission_test.go fix bug when update owner team then visit team's repo return 404 (#6119) 2019-02-22 11:14:45 -05:00
repo_redirect.go Move repoWorkPool outside rename/transfer repository (#9086) 2019-12-06 12:00:50 +08:00
repo_redirect_test.go Move repoWorkPool outside rename/transfer repository (#9086) 2019-12-06 12:00:50 +08:00
repo_sign.go Sign: Handle ErrTwoFactorNotEnrolled correctly (#10008) 2020-01-26 23:44:12 +00:00
repo_test.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
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 Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055) 2019-12-03 20:08:56 -05:00
ssh_key.go API add/generalize pagination (#9452) 2020-01-24 14:00:29 -05:00
ssh_key_test.go Fix SSH2 conditonal in key parsing code (#8806) 2019-11-03 19:08:18 +08:00
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 Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
test_fixtures.go Testing: Update postgres sequences (#9304) 2019-12-10 07:49:05 +00:00
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 Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
u2f.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
u2f_test.go Override xorm type mapping for U2F counter (#6232) 2019-03-04 21:34:52 -05:00
unit.go Add setting to set default and global disabled repository units. (#8788) 2020-01-17 09:34:37 +02:00
unit_tests.go Upgrade xorm to v0.8.0 (#8536) 2019-10-17 11:26:49 +02:00
update.go Move PushUpdateAddDeleteTags to repository module from models (#10106) 2020-02-03 09:47:04 +01:00
upload.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
user.go [API] Fix inconsistent label color format (#10129) 2020-02-09 14:33:03 +00:00
user_follow.go Refactor session close as xorm already does everything needed internally (#2020) 2017-06-21 08:57:05 +08:00
user_follow_test.go Move user_follow to separate file (#1210) 2017-03-11 16:46:53 +08:00
user_heatmap.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
user_heatmap_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
user_mail.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
user_mail_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03:00
user_openid.go Fix SQL quoting (#5117) 2018-10-20 18:19:21 -04:00
user_openid_test.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
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 Team permission to create repository in organization (#8312) 2019-11-20 19:27:49 +08:00
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 Add owner_name column for table repository for maintaince reason (#9717) 2020-01-12 17:36:21 +08:00
wiki_test.go Move wiki related funtions from models to services/wiki (#9355) 2020-01-07 18:27:36 +00:00