diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-27 01:06:57 -0600 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-27 01:06:57 -0600 |
| commit | ce05a8d7b6939b4f67a8e779bcc784d1b8ef8fab (patch) | |
| tree | 4863a004973ba569d39e8f7d6c9fc3ddffb39bd5 | |
| parent | 62d23e91541550d0478c4884696e918a0e818b4f (diff) | |
| parent | 9fdf4bc2776f07774f6303536400858aa0bcb8aa (diff) | |
| download | gitea-ce05a8d7b6939b4f67a8e779bcc784d1b8ef8fab.tar.gz gitea-ce05a8d7b6939b4f67a8e779bcc784d1b8ef8fab.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
templates/repo/single_list.tmpl
| -rw-r--r-- | routers/repo/commit.go | 2 | ||||
| -rw-r--r-- | templates/repo/commits.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/single_list.tmpl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 6e20a7b7f4..9ecc697d27 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -92,7 +92,7 @@ func Diff(ctx *middleware.Context, params martini.Params) { } ctx.Data["IsImageFile"] = isImageFile - ctx.Data["Title"] = commit.Message() + " · " + base.ShortSha(commitId) + ctx.Data["Title"] = commit.Summary() + " · " + base.ShortSha(commitId) ctx.Data["Commit"] = commit ctx.Data["Diff"] = diff ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0 diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index bfc0bf21bf..74b03074bc 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -33,7 +33,7 @@ <tr> <td class="author"><img class="avatar" src="{{AvatarLink .Author.Email}}" alt=""/><a href="/user/email2user?email={{.Author.Email}}">{{.Author.Name}}</a></td> <td class="sha"><a rel="nofollow" class="label label-success" href="/{{$username}}/{{$reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 10}} </a></td> - <td class="message">{{.Message}} </td> + <td class="message">{{.Summary}} </td> <td class="date">{{TimeSince .Author.When}}</td> </tr> {{end}} diff --git a/templates/repo/single_list.tmpl b/templates/repo/single_list.tmpl index 49a0ec5af4..640f7f0901 100644 --- a/templates/repo/single_list.tmpl +++ b/templates/repo/single_list.tmpl @@ -1,6 +1,6 @@ <div class="panel panel-default info-box"> <div class="panel-heading info-head"> - <a href="/{{.Username}}/{{.Reponame}}/commit/{{.LastCommit.Id}}" rel="nofollow">{{.LastCommit.Message}}</a> + <a href="/{{.Username}}/{{.Reponame}}/commit/{{.LastCommit.Id}}" rel="nofollow">{{.LastCommit.Summary}}</a> </div> <div class="panel-body info-content"> <a href="/user/{{.LastCommit.Author.Name}}">{{.LastCommit.Author.Name}}</a> <span class="text-muted">{{TimeSince .LastCommit.Author.When}}</span> @@ -36,7 +36,7 @@ </span> </td> <td class="text"> - <span class="wrap"><a rel="nofollow" href="/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}">{{$commit.Message}}</a></span> + <span class="wrap"><a rel="nofollow" href="/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}">{{$commit.Summary}}</a></span> </td> <td class="date"> <span class="wrap">{{TimeSince $commit.Committer.When}}</span> |