diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2019-12-22 03:29:26 -0500 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-12-22 08:29:26 +0000 |
| commit | 1df701fd1abbcee93dfcd3cdb114a0f35cb6be45 (patch) | |
| tree | 70b1f1a47be30eb83ae89a6ba444bcf48357f303 /templates/user | |
| parent | 875d6b2f8e52a362e47118393bcd47026852db8c (diff) | |
| download | gitea-1df701fd1abbcee93dfcd3cdb114a0f35cb6be45.tar.gz gitea-1df701fd1abbcee93dfcd3cdb114a0f35cb6be45.zip | |
Add ActionCommentPull action (#9456)
* Add ActionCommentPull action
Adds ActionCommentPull action to distinguish between a comment on an
issue and on a pull request
* Update modules/notification/action/action.go
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 48cdb49c15..7c4b1da0c7 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -67,6 +67,9 @@ {{else if eq .GetOpType 22}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.reject_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 23}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{end}} </p> {{if or (eq .GetOpType 5) (eq .GetOpType 18)}} @@ -86,7 +89,7 @@ <span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> {{else if eq .GetOpType 7}} <span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> - {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22)}} + {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} <a href="{{.GetCommentLink}}" class="text truncate issue title has-emoji">{{.GetIssueTitle}}</a> <p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> {{else if eq .GetOpType 11}} |