Gusted 081449d7a5 Don't allow merging PR's which are being conflict checked (#19357) (#19358) ... * Don't allow merging PR's which are being conflict checked (#19357) - Backport of #19357 - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Resolves #19352 * Update error message		2022-04-13 00:38:41 +08:00
..
agit	Fix various typos (#18219)	2022-01-10 17:32:37 +08:00
asymkey	Refactor auth package (#17962)	2022-01-02 21:12:35 +08:00
attachment	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
auth	Restore user autoregistration with email addresses (#19261) (#19312)	2022-04-02 20:36:47 -04:00
comments	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
cron	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
externalaccount	Refactor auth package (#17962)	2022-01-02 21:12:35 +08:00
forms	Move checks for pulls before merge into own function (#19271) (#19277)	2022-03-31 16:57:13 +02:00
gitdiff	Bump to build with go1.18 (#19120 et al) (#19127)	2022-03-19 18:46:47 +01:00
issue	Restore propagation of ErrDependenciesLeft (#18325)	2022-01-19 00:26:42 +01:00
lfs	Support webauthn (#17957)	2022-01-14 16:03:31 +01:00
mailer	Try to prevent autolinking of displaynames by email readers (#19169) (#19183)	2022-03-23 15:18:11 +02:00
migrations	Make migrations SKIP_TLS_VERIFY apply to git too (#19132) (#19141)	2022-03-19 16:20:26 +00:00
mirror	Use full output of git show-ref --tags to get tags for PushUpdateAddTag (#19235) (#19236)	2022-03-29 23:19:57 +03:00
org	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
pull	Don't allow merging PR's which are being conflict checked (#19357) (#19358)	2022-04-13 00:38:41 +08:00
release	Set HeadCommit when creating tags. (#18116)	2021-12-29 19:40:57 +08:00
repository	Use full output of git show-ref --tags to get tags for PushUpdateAddTag (#19235) (#19236)	2022-03-29 23:19:57 +03:00
task	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
user	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
webhook	Only send webhook events to active system webhooks and only deliver to active hooks (#19234) (#19248)	2022-03-29 14:12:56 +02:00
wiki	Fix various typos (#18219)	2022-01-10 17:32:37 +08:00