diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/action.go | 18 | ||||
| -rw-r--r-- | models/issue.go | 6 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 13 insertions, 15 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogs/gogs/pkg/setting" ) -const APP_VER = "0.11.80.1216" +const APP_VER = "0.11.81.1217" func init() { setting.AppVer = APP_VER diff --git a/models/action.go b/models/action.go index 61c6afc3..7d196652 100644 --- a/models/action.go +++ b/models/action.go @@ -58,20 +58,15 @@ var ( IssueCloseKeywords = []string{"close", "closes", "closed", "fix", "fixes", "fixed", "resolve", "resolves", "resolved"} IssueReopenKeywords = []string{"reopen", "reopens", "reopened"} - IssueCloseKeywordsPat, IssueReopenKeywordsPat *regexp.Regexp - IssueReferenceKeywordsPat *regexp.Regexp + IssueCloseKeywordsPat = regexp.MustCompile(assembleKeywordsPattern(IssueCloseKeywords)) + IssueReopenKeywordsPat = regexp.MustCompile(assembleKeywordsPattern(IssueReopenKeywords)) + IssueReferenceKeywordsPat = regexp.MustCompile(`(?i)(?:)(^| )\S+`) ) func assembleKeywordsPattern(words []string) string { return fmt.Sprintf(`(?i)(?:%s) \S+`, strings.Join(words, "|")) } -func init() { - IssueCloseKeywordsPat = regexp.MustCompile(assembleKeywordsPattern(IssueCloseKeywords)) - IssueReopenKeywordsPat = regexp.MustCompile(assembleKeywordsPattern(IssueReopenKeywords)) - IssueReferenceKeywordsPat = regexp.MustCompile(`(?i)(?:)(^| )\S+`) -} - // Action represents user operation type and other information to repository, // it implemented interface base.Actioner so that can be used in template render. type Action struct { @@ -492,8 +487,11 @@ func CommitRepoAction(opts CommitRepoActionOptions) error { opts.Commits.CompareURL = repo.ComposeCompareURL(opts.OldCommitID, opts.NewCommitID) } - if err = UpdateIssuesCommit(pusher, repo, opts.Commits.Commits); err != nil { - log.Error(2, "UpdateIssuesCommit: %v", err) + // Only update issues via commits when internal issue tracker is enabled + if repo.EnableIssues && !repo.EnableExternalTracker { + if err = UpdateIssuesCommit(pusher, repo, opts.Commits.Commits); err != nil { + log.Error(2, "UpdateIssuesCommit: %v", err) + } } } diff --git a/models/issue.go b/models/issue.go index 195c0cf9..64c70744 100644 --- a/models/issue.go +++ b/models/issue.go @@ -804,9 +804,9 @@ func GetIssueByRef(ref string) (*Issue, error) { return nil, errors.InvalidIssueReference{ref} } - index, err := com.StrTo(ref[n+1:]).Int64() - if err != nil { - return nil, err + index := com.StrTo(ref[n+1:]).MustInt64() + if index == 0 { + return nil, errors.IssueNotExist{} } repo, err := GetRepositoryByRef(ref[:n]) diff --git a/templates/.VERSION b/templates/.VERSION index d1700091..da31b367 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.80.1216 +0.11.81.1217 |