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

..

convert.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

git_commit_test.go

Move repository model into models/repo (#17933)

2021-12-10 09:27:50 +08:00

git_commit.go

More commit info from API (#19252)

2022-03-29 10:47:44 -05:00

issue_comment.go

Add API to get issue/pull comments and events (timeline) (#17403)

2022-01-01 22:12:25 +08:00

issue_test.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

main_test.go

Use a struct as test options (#19393)

2022-04-14 21:58:21 +08:00

notification.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

package.go

Add Package Registry (#16510)

2022-03-30 16:42:47 +08:00

pull_review.go

Propagate context and ensure git commands run in request context (#17868)

2022-01-19 23:26:57 +00:00

pull_test.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

pull.go

Set correct PR status on 3way on conflict checking (#19457)

2022-04-21 22:55:45 +01:00

release.go

Move attachment into models/repo/ (#17650)

2021-11-19 21:39:57 +08:00

repository.go

API: Return primary language and repository language stats API URL (#18396)

2022-01-25 08:33:40 +02:00

status.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

user_test.go

Move user related model into models/user (#17781)

2021-11-24 17:49:20 +08:00

user.go

Move accessmode into models/perm (#17828)

2021-11-28 12:58:28 +01:00

utils_test.go

A better go code formatter, and now make fmt can run in Windows (#17684)

2021-11-17 20:34:35 +08:00

utils.go

Add migration from GitBucket (#16767)

2021-11-14 20:11:10 +01:00

wiki.go

Move repository model into models/repo (#17933)

2021-12-10 09:27:50 +08:00