Skip to content

Commit 8720f87

Browse files
certikzeripath
andauthored
Make WIP prefixes case insensitive, e.g. allow Draft as a WIP prefix (#19780)
The issue was that only the actual title was converted to uppercase, but not the prefix as specified in `WORK_IN_PROGRESS_PREFIXES`. As a result, the following did not work: WORK_IN_PROGRESS_PREFIXES=Draft:,[Draft],WIP:,[WIP] One possible workaround was: WORK_IN_PROGRESS_PREFIXES=DRAFT:,[DRAFT],WIP:,[WIP] Then indeed one could use `Draft` (as well as `DRAFT`) in the title. However, the link `Start the title with DRAFT: to prevent the pull request from being merged accidentally.` showed the suggestion in uppercase; so it is not possible to show it as `Draft`. This PR fixes it, and allows to use `Draft` in `WORK_IN_PROGRESS_PREFIXES`. Fixes #19779. Co-authored-by: zeripath <[email protected]>
1 parent 9574626 commit 8720f87

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

custom/conf/app.example.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ PATH =
938938
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
939939
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
940940
;;
941-
;; List of prefixes used in Pull Request title to mark them as Work In Progress
941+
;; List of prefixes used in Pull Request title to mark them as Work In Progress (matched in a case-insensitive manner)
942942
;WORK_IN_PROGRESS_PREFIXES = WIP:,[WIP]
943943
;;
944944
;; List of keywords used in Pull Request comments to automatically close a related issue

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
8787
### Repository - Pull Request (`repository.pull-request`)
8888

8989
- `WORK_IN_PROGRESS_PREFIXES`: **WIP:,\[WIP\]**: List of prefixes used in Pull Request
90-
title to mark them as Work In Progress
90+
title to mark them as Work In Progress. These are matched in a case-insensitive manner.
9191
- `CLOSE_KEYWORDS`: **close**, **closes**, **closed**, **fix**, **fixes**, **fixed**, **resolve**, **resolves**, **resolved**: List of
9292
keywords used in Pull Request comments to automatically close a related issue
9393
- `REOPEN_KEYWORDS`: **reopen**, **reopens**, **reopened**: List of keywords used in Pull Request comments to automatically reopen

models/pull.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ func (pr *PullRequest) IsWorkInProgress() bool {
588588
// HasWorkInProgressPrefix determines if the given PR title has a Work In Progress prefix
589589
func HasWorkInProgressPrefix(title string) bool {
590590
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
591-
if strings.HasPrefix(strings.ToUpper(title), prefix) {
591+
if strings.HasPrefix(strings.ToUpper(title), strings.ToUpper(prefix)) {
592592
return true
593593
}
594594
}
@@ -609,7 +609,7 @@ func (pr *PullRequest) GetWorkInProgressPrefix() string {
609609
}
610610

611611
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
612-
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
612+
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), strings.ToUpper(prefix)) {
613613
return pr.Issue.Title[0:len(prefix)]
614614
}
615615
}

0 commit comments

Comments
 (0)