summaryrefslogtreecommitdiff
path: root/app/views/events/_event_push.atom.haml
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-30 10:33:43 +0100
committerPhil Hughes <me@iamphill.com>2018-05-30 10:33:43 +0100
commitc760965079fce0f020980987794ea61c86eb09ff (patch)
tree32bbac523c665a785eaaab85d9be305c02d8ce68 /app/views/events/_event_push.atom.haml
parent323e402e21a643da22714bdede3cc6e248ba2cf4 (diff)
parentfd79df64c5411308e67a62b4c02a07f5317ddec1 (diff)
downloadgitlab-ce-c760965079fce0f020980987794ea61c86eb09ff.tar.gz
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'app/views/events/_event_push.atom.haml')
-rw-r--r--app/views/events/_event_push.atom.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml
index e3c5fd55f08..bc1d32607e4 100644
--- a/app/views/events/_event_push.atom.haml
+++ b/app/views/events/_event_push.atom.haml
@@ -6,7 +6,7 @@
at
= event.created_at.to_s(:short)
- unless event.rm_ref?
- %blockquote= markdown(escape_once(event.commit_title), pipeline: :atom, project: event.project, author: event.author)
+ .blockquote= markdown(escape_once(event.commit_title), pipeline: :atom, project: event.project, author: event.author)
- if event.commits_count > 1
%p
%i