Browse Source

comment: only show title of commit message from a commit ref (#3206)

pull/3854/merge
Unknwon 8 years ago
parent
commit
28983c94ff
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 2
      gogs.go
  2. 7
      models/action.go
  3. 2
      templates/.VERSION
  4. 1
      templates/repo/issue/view_content.tmpl

2
gogs.go

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.9.165.0221 / 0.10 RC"
const APP_VER = "0.9.165.0222 / 0.10 RC"
func init() {
setting.AppVer = APP_VER

7
models/action.go

@ -335,7 +335,12 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
}
refMarked[issue.ID] = true
message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, c.Message)
msgLines := strings.Split(c.Message, "\n")
shortMsg := msgLines[0]
if len(msgLines) > 2 {
shortMsg += "..."
}
message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, shortMsg)
if err = CreateRefComment(doer, repo, issue, message, c.Sha1); err != nil {
return err
}

2
templates/.VERSION

@ -1 +1 @@
0.9.165.0221 / 0.10 RC
0.9.165.0222 / 0.10 RC

1
templates/repo/issue/view_content.tmpl

@ -138,7 +138,6 @@
<img src="{{.Poster.RelAvatarLink}}">
</a>
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
<div class="detail">
<span class="octicon octicon-git-commit"></span>
<span class="text grey">{{.Content | Str2html}}</span>

Loading…
Cancel
Save