Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-25 17:12:19 +0300
committerDouwe Maan <douwe@gitlab.com>2015-02-25 17:12:19 +0300
commit5d86332153838252384f9f87a0ae3e34c46eb266 (patch)
tree47de3c1f04c5b2302f6269d6284d68cd29158214 /app/views/notify/repository_push_email.html.haml
parent769f137a5344dbc3748c2fea7c1d560392410ca4 (diff)
Send EmailsOnPush when deleting commits using force push.
See #1924.
Diffstat (limited to 'app/views/notify/repository_push_email.html.haml')
-rw-r--r--app/views/notify/repository_push_email.html.haml8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index 1a617e2108d..039b92df2be 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -1,6 +1,12 @@
%h3 #{@author.name} pushed to #{@branch} at #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}
-%h4 Commits:
+- if @reverse_compare
+ %p
+ %strong WARNING:
+ The push did not contain any new commits, but force pushed to delete the commits and changes below.
+
+%h4
+ = @reverse_compare ? "Deleted commits:" : "Commits:"
%ul
- @commits.each do |commit|