Skip to content

Commit 195b413

Browse files
committed
move default wip prefixes into settings
Signed-off-by: Julien Tant <[email protected]>
1 parent 864f795 commit 195b413

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

custom/conf/app.ini.sample

+3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ FILE_MAX_SIZE = 3
6060
; Max number of files per upload. Defaults to 5
6161
MAX_FILES = 5
6262

63+
[repository.pull-request]
64+
WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
65+
6366
[ui]
6467
; Number of repositories that are displayed on one explore page
6568
EXPLORE_PAGING_NUM = 20

models/pull.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -1195,20 +1195,14 @@ func (pr *PullRequest) checkAndUpdateStatus() {
11951195
}
11961196
}
11971197

1198-
// Enumerate the prefixes that will help determine if a pull request is a Work In Progress
1199-
var pullRequestWorkInProgressPrefixes = [...]string{
1200-
"WIP:",
1201-
"[WIP]",
1202-
}
1203-
12041198
// IsWorkInProgress determine if the Pull Request is a Work In Progress by its title
12051199
func (pr *PullRequest) IsWorkInProgress() bool {
12061200
if err := pr.LoadIssue(); err != nil {
12071201
log.Error(4, "LoadIssue: %v", err)
12081202
return false
12091203
}
12101204

1211-
for _, prefix := range pullRequestWorkInProgressPrefixes {
1205+
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
12121206
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
12131207
return true
12141208
}
@@ -1224,7 +1218,7 @@ func (pr *PullRequest) GetWorkInProgressPrefix() string {
12241218
return ""
12251219
}
12261220

1227-
for _, prefix := range pullRequestWorkInProgressPrefixes {
1221+
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
12281222
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
12291223
return pr.Issue.Title[0:len(prefix)]
12301224
}

modules/setting/defaults.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
)
66

77
var (
8-
defaultLangs = strings.Split("en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR", ",")
9-
defaultLangNames = strings.Split("English,简体中文,繁體中文(香港),繁體中文(台灣),Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어", ",")
8+
defaultLangs = strings.Split("en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR", ",")
9+
defaultLangNames = strings.Split("English,简体中文,繁體中文(香港),繁體中文(台灣),Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어", ",")
10+
defaultPullRequestWorkInProgressPrefixes = strings.Split("WIP:,[WIP]", ",")
1011
)

modules/setting/setting.go

+14
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ var (
223223
LocalCopyPath string
224224
LocalWikiPath string
225225
} `ini:"-"`
226+
227+
// Pull request settings
228+
PullRequest struct {
229+
WorkInProgressPrefixes []string
230+
} `ini:"repository.pull-request"`
226231
}{
227232
AnsiCharset: "",
228233
ForcePrivate: false,
@@ -266,6 +271,13 @@ var (
266271
LocalCopyPath: "tmp/local-repo",
267272
LocalWikiPath: "tmp/local-wiki",
268273
},
274+
275+
// Pull request settings
276+
PullRequest: struct {
277+
WorkInProgressPrefixes []string
278+
}{
279+
WorkInProgressPrefixes: defaultPullRequestWorkInProgressPrefixes,
280+
},
269281
}
270282
RepoRootPath string
271283
ScriptType = "bash"
@@ -1024,6 +1036,8 @@ func NewContext() {
10241036
log.Fatal(4, "Failed to map Repository.Upload settings: %v", err)
10251037
} else if err = Cfg.Section("repository.local").MapTo(&Repository.Local); err != nil {
10261038
log.Fatal(4, "Failed to map Repository.Local settings: %v", err)
1039+
} else if err = Cfg.Section("repository.pull-request").MapTo(&Repository.PullRequest); err != nil {
1040+
log.Fatal(4, "Failed to map Repository.PullRequest settings: %v", err)
10271041
}
10281042

10291043
if !filepath.IsAbs(Repository.Upload.TempPath) {

0 commit comments

Comments
 (0)