move default wip prefixes into settings

Signed-off-by: Julien Tant <julien@craftyx.fr>
go-gitea · Aug 1, 2018 · 195b413 · 195b413
1 parent 864f795
commit 195b413
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample
@@ -60,6 +60,9 @@ FILE_MAX_SIZE = 3
 ; Max number of files per upload. Defaults to 5
 MAX_FILES = 5
 
+[repository.pull-request]
+WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
+
 [ui]
 ; Number of repositories that are displayed on one explore page
 EXPLORE_PAGING_NUM = 20

diff --git a/models/pull.go b/models/pull.go
@@ -1195,20 +1195,14 @@ func (pr *PullRequest) checkAndUpdateStatus() {
 	}
 }
 
-// Enumerate the prefixes that will help determine if a pull request is a Work In Progress
-var pullRequestWorkInProgressPrefixes = [...]string{
-	"WIP:",
-	"[WIP]",
-}
-
 // IsWorkInProgress determine if the Pull Request is a Work In Progress by its title
 func (pr *PullRequest) IsWorkInProgress() bool {
 	if err := pr.LoadIssue(); err != nil {
 		log.Error(4, "LoadIssue: %v", err)
 		return false
 	}
 
-	for _, prefix := range pullRequestWorkInProgressPrefixes {
+	for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
 		if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
 			return true
 		}
@@ -1224,7 +1218,7 @@ func (pr *PullRequest) GetWorkInProgressPrefix() string {
 		return ""
 	}
 
-	for _, prefix := range pullRequestWorkInProgressPrefixes {
+	for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
 		if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
 			return pr.Issue.Title[0:len(prefix)]
 		}

diff --git a/modules/setting/defaults.go b/modules/setting/defaults.go
@@ -5,6 +5,7 @@ import (
 )
 
 var (
-	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", ",")
-	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,한국어", ",")
+	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", ",")
+	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,한국어", ",")
+	defaultPullRequestWorkInProgressPrefixes = strings.Split("WIP:,[WIP]", ",")
 )
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
@@ -223,6 +223,11 @@ var (
 			LocalCopyPath string
 			LocalWikiPath string
 		} `ini:"-"`
+
+		// Pull request settings
+		PullRequest struct {
+			WorkInProgressPrefixes []string
+		} `ini:"repository.pull-request"`
 	}{
 		AnsiCharset:            "",
 		ForcePrivate:           false,
@@ -266,6 +271,13 @@ var (
 			LocalCopyPath: "tmp/local-repo",
 			LocalWikiPath: "tmp/local-wiki",
 		},
+
+		// Pull request settings
+		PullRequest: struct {
+			WorkInProgressPrefixes []string
+		}{
+			WorkInProgressPrefixes: defaultPullRequestWorkInProgressPrefixes,
+		},
 	}
 	RepoRootPath string
 	ScriptType   = "bash"
@@ -1024,6 +1036,8 @@ func NewContext() {
 		log.Fatal(4, "Failed to map Repository.Upload settings: %v", err)
 	} else if err = Cfg.Section("repository.local").MapTo(&Repository.Local); err != nil {
 		log.Fatal(4, "Failed to map Repository.Local settings: %v", err)
+	} else if err = Cfg.Section("repository.pull-request").MapTo(&Repository.PullRequest); err != nil {
+		log.Fatal(4, "Failed to map Repository.PullRequest settings: %v", err)
 	}
 
 	if !filepath.IsAbs(Repository.Upload.TempPath) {