diff options
author | Unknwon <u@gogs.io> | 2015-09-02 11:24:55 -0400 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-09-02 11:24:55 -0400 |
commit | 842770d7fbc72789d6df885da7ec5a2d4070f25f (patch) | |
tree | 1b2ff56263f8ae35cb4a0b77011584a566822b6b /templates | |
parent | 5da306c0e5a2939b836d5ec00a0984a2c30e0f9f (diff) | |
download | gitea-842770d7fbc72789d6df885da7ec5a2d4070f25f.tar.gz gitea-842770d7fbc72789d6df885da7ec5a2d4070f25f.zip |
add merger info and news feed
Diffstat (limited to 'templates')
-rw-r--r-- | templates/user/dashboard/feeds.tmpl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index cd00f76402..5c2a747024 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -15,6 +15,9 @@ {{else if eq .GetOpType 6}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} + {{else if eq .GetOpType 7}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.create_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} {{else if eq .GetOpType 8}} {{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} {{else if eq .GetOpType 9}} @@ -39,6 +42,8 @@ </div> {{else if eq .GetOpType 6}} <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> + {{else if eq .GetOpType 7}} + <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> {{else if eq .GetOpType 10}} <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> {{end}} |