diff options
| author | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
|---|---|---|
| committer | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
| commit | 8d2a6fc484b540819e211d52b8d54e97269f0918 (patch) | |
| tree | e5bfe7d3937bb2d18ba2fb50ea72514bd5bb4e13 /templates/user/dashboard/feeds.tmpl | |
| parent | 29ac3980ffdb5faa525d77fddc109c9023ebe257 (diff) | |
| parent | 89bd994c836ecc9b6ceb80849f470521e1b15917 (diff) | |
| download | gitea-8d2a6fc484b540819e211d52b8d54e97269f0918.tar.gz gitea-8d2a6fc484b540819e211d52b8d54e97269f0918.zip | |
Merge remote-tracking branch 'upstream/dev'
Conflicts:
models/repo.go
Diffstat (limited to 'templates/user/dashboard/feeds.tmpl')
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 4c05440b1e..57c97def2e 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -15,6 +15,8 @@ {{$.i18n.Tr "action.create_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} {{else if eq .GetOpType 8}} {{$.i18n.Tr "action.transfer_repo" .GetContent AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} + {{else if eq .GetOpType 9}} + {{$.i18n.Tr "action.push_tag" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} {{else if eq .GetOpType 10}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.comment_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} @@ -28,6 +30,7 @@ {{range $push.Commits}} <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="{{AppSubUrl}}/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li> {{end}} + {{if $push.CompareUrl}}<li><a href="{{$push.CompareUrl}}">{{$.i18n.Tr "action.compare_2_commits"}} ยป</a></li>{{end}} </ul> </div> {{else if eq .GetOpType 6}} |