mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts: conf/app.ini
This commit is contained in:
@@ -1 +1 @@
|
||||
0.5.0.0913 Beta
|
||||
0.5.2.0916 Beta
|
@@ -29,7 +29,7 @@
|
||||
<p class="info">
|
||||
<span class="author"><img class="avatar" src="{{.Publisher.AvatarLink}}" alt="" width="20">
|
||||
<a href="/user/{{.Publisher.Name}}">{{.Publisher.Name}}</a></span>
|
||||
{{if .Created}}<span class="time">{{TimeSince .Created}}</span>{{end}}
|
||||
{{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}}
|
||||
<span class="ahead"><strong>{{.NumCommitsBehind}}</strong> commits to {{.Target}} since this release</span>
|
||||
</p>
|
||||
<div class="markdown desc">
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<div class="avatar left">
|
||||
<img class="avatar-30" src="{{AvatarLink .GetActEmail}}" alt="">
|
||||
</div>
|
||||
<div class="content left {{if eq .GetOpType 5}}push-news{{end}}">
|
||||
<div class="content left {{if eq .GetOpType 5}}push-news{{end}} grid-4-5">
|
||||
<p class="text-bold">
|
||||
<a href="/{{.GetActUserName}}">{{.GetActUserName}}</a>
|
||||
{{if eq .GetOpType 1}}
|
||||
@@ -30,7 +30,7 @@
|
||||
{{ $push := ActionContent2Commits .}}
|
||||
{{ $repoLink := .GetRepoLink}}
|
||||
{{range $push.Commits}}
|
||||
<li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> {{.Message}}</li>
|
||||
<li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li>
|
||||
{{end}}
|
||||
</ul>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user