diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 11:45:14 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 11:45:14 +0000 |
| commit | 464123b388677bb2214515c9a495bd453689ff59 (patch) | |
| tree | 85d0ceba49a3fe04958a9fc5686c7898e3814249 | |
| parent | 93b2a30c79f0fc3bdf30e3f2243e5577c236e190 (diff) | |
| parent | 59f0d91a20663cc6ddd82f716606bb2216a1e20a (diff) | |
| download | gitlab-ce-464123b388677bb2214515c9a495bd453689ff59.tar.gz | |
Merge branch 'emailsonpush-prefix' into 'master'
Prefix EmailsOnPush email subject with `[Git]`.
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112.
See merge request !701
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/mailers/emails/projects.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 33b460345d5..ee733858552 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ v 7.12.0 (unreleased) - Add a note when an Issue or Merge Request's title changes - Consistently refer to MRs as either Accepted or Rejected. - Add Accepted and Rejected tabs to MR lists. + - 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 << " " |