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
appstate
asymkey
auth
avatars
db
fixtures
foreignreference
issues
migrations
organization
packages
perm
project
repo
unit
unittest
user
webhook
access_test.go
access.go
action_list.go
action_test.go
action.go
branches_test.go
branches.go
commit_status_test.go
commit_status.go
commit.go
consistency_test.go
consistency.go
engine_test.go
error.go
fixture_generation.go
fixture_test.go
helper_directory.go
helper_environment.go
helper.go
issue_assignees_test.go
issue_assignees.go
issue_comment_list.go
issue_comment_test.go
issue_comment.go
issue_dependency_test.go
issue_dependency.go
issue_label_test.go
issue_label.go
issue_list_test.go
issue_list.go
issue_lock.go
issue_project.go
issue_stopwatch_test.go
issue_stopwatch.go
issue_test.go
issue_tracked_time_test.go
issue_tracked_time.go
issue_user_test.go
issue_user.go
issue_watch_test.go
issue_watch.go
issue_xref_test.go
issue_xref.go
issue.go
lfs_lock.go
lfs.go
main_test.go
migrate_test.go
migrate.go
notification_test.go
notification.go
org_team_test.go
org_team.go
org_test.go
org.go
protected_tag_test.go
protected_tag.go
pull_list.go
pull_test.go
pull.go
release.go
repo_activity.go
repo_collaboration_test.go
repo_collaboration.go
repo_generate_test.go
repo_generate.go
repo_list_test.go
repo_list.go
repo_permission_test.go
repo_permission.go
repo_test.go
repo_transfer_test.go
repo_transfer.go
repo.go
review_test.go
review.go
statistic.go
task.go
token_test.go
token.go
upload.go
user_heatmap_test.go
user_heatmap.go
user_test.go
user.go
userlist_test.go
userlist.go