summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-25 16:35:37 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-25 16:35:37 +0200
commit59f0d91a20663cc6ddd82f716606bb2216a1e20a (patch)
treed903f6b2d34504cb1d224a349afd47dfe5116e9d
parent84cb0dcbcd361730afcfbc72ea4aa7d9204f12d4 (diff)
downloadgitlab-ce-emailsonpush-prefix.tar.gz
Prefix EmailsOnPush email subject with `[Git]`.emailsonpush-prefix
-rw-r--r--CHANGELOG1
-rw-r--r--app/mailers/emails/projects.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9e4033fcc3d..9fddef2a31f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.12.0 (unreleased)
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
- Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
- Use the user list from the target project in a merge request (Stan Hu)
+ - Prefix EmailsOnPush email subject with `[Git]`.
v 7.11.2
- no changes
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 9cb7077e59d..4a6e18e6a74 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -93,7 +93,8 @@ module Emails
"pushed to"
end
- @subject = "[#{@project.path_with_namespace}]"
+ @subject = "[Git]"
+ @subject << "[#{@project.path_with_namespace}]"
@subject << "[#{@ref_name}]" if action == :push
@subject << " "