Gusted ebe569a268 Set correct PR status on 3way on conflict checking (#19457) ... * Set correct PR status on 3way on conflict checking - When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's. - Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable. - Add a dedicated test for conflicting checking, so it should prevent future issues with this. * Fix linter		2022-04-21 22:55:45 +01:00
..
admin	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
appstate
asymkey	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
auth	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
avatars
db	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
fixtures	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
foreignreference	Store the foreign ID of issues during migration (#18446)	2022-03-17 18:08:35 +01:00
issues	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
migrations	Remove legacy unknwon/com package (#19298)	2022-04-02 00:34:57 +08:00
organization	Fix panic in team repos API (#19431)	2022-04-20 18:43:26 +08:00
packages	Add Helm Chart registry (#19406)	2022-04-19 12:55:35 -04:00
perm
project	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
repo	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
unit
unittest	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
user	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
webhook	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
access_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
access.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
action_list.go	Move reaction to models/issues/ (#19264)	2022-03-31 17:20:39 +08:00
action_test.go	RSS/Atom support for Repos (#19055)	2022-03-13 17:40:47 +01:00
action.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
branches_test.go
branches.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
commit_status_test.go
commit_status.go
commit.go
consistency_test.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
consistency.go
engine_test.go
error.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
fixture_generation.go
fixture_test.go
helper_directory.go
helper_environment.go	Fix the bug: deploy key with write access can not push (#19010)	2022-03-22 17:29:07 +08:00
helper.go	Move reaction to models/issues/ (#19264)	2022-03-31 17:20:39 +08:00
issue_assignees_test.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
issue_assignees.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_comment_list.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_comment_test.go
issue_comment.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_dependency_test.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
issue_dependency.go
issue_label_test.go	Move init repository related functions to modules (#19159)	2022-03-29 15:23:45 +08:00
issue_label.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_list_test.go
issue_list.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_lock.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_project.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_stopwatch_test.go
issue_stopwatch.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_test.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_tracked_time_test.go	Refactor SecToTime() function (#18863)	2022-02-28 23:57:20 +01:00
issue_tracked_time.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_user_test.go
issue_user.go
issue_watch_test.go
issue_watch.go
issue_xref_test.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
issue_xref.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
lfs_lock.go
lfs.go	Improve SyncMirrors logging (#19045)	2022-03-10 10:09:48 +00:00
main_test.go	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
migrate_test.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
migrate.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
notification_test.go
notification.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
org_team_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
org_team.go	Performance improvement for add team user when org has more than 1000 repositories (#19227)	2022-04-01 09:53:18 +08:00
org_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
org.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
protected_tag_test.go
protected_tag.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
pull_list.go
pull_test.go	Move checks for pulls before merge into own function (#19271)	2022-03-31 16:53:08 +02:00
pull.go	Set correct PR status on 3way on conflict checking (#19457)	2022-04-21 22:55:45 +01:00
release.go
repo_activity.go
repo_collaboration_test.go
repo_collaboration.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
repo_generate_test.go
repo_generate.go	Move init repository related functions to modules (#19159)	2022-03-29 15:23:45 +08:00
repo_list_test.go
repo_list.go	Move reaction to models/issues/ (#19264)	2022-03-31 17:20:39 +08:00
repo_permission_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
repo_permission.go	Fix broken of team create (#19288)	2022-04-01 14:05:31 +08:00
repo_test.go	Allow users to self-request a PR review (#19030)	2022-03-08 22:48:47 +01:00
repo_transfer_test.go
repo_transfer.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
repo.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
review_test.go
review.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
statistic.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
task.go	Use a more general (and faster) method to sanitize URLs with credentials (#19239)	2022-03-31 10:25:40 +08:00
token_test.go
token.go
upload.go
user_heatmap_test.go	RSS/Atom support for Repos (#19055)	2022-03-13 17:40:47 +01:00
user_heatmap.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
user_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
user.go	Move reaction to models/issues/ (#19264)	2022-03-31 17:20:39 +08:00
userlist_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
userlist.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00