Commit 464123b3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 93b2a30c 59f0d91a
...@@ -19,6 +19,7 @@ v 7.12.0 (unreleased) ...@@ -19,6 +19,7 @@ v 7.12.0 (unreleased)
- Add a note when an Issue or Merge Request's title changes - Add a note when an Issue or Merge Request's title changes
- Consistently refer to MRs as either Accepted or Rejected. - Consistently refer to MRs as either Accepted or Rejected.
- Add Accepted and Rejected tabs to MR lists. - Add Accepted and Rejected tabs to MR lists.
- Prefix EmailsOnPush email subject with `[Git]`.
v 7.11.2 v 7.11.2
- no changes - no changes
......
...@@ -93,7 +93,8 @@ module Emails ...@@ -93,7 +93,8 @@ module Emails
"pushed to" "pushed to"
end end
@subject = "[#{@project.path_with_namespace}]" @subject = "[Git]"
@subject << "[#{@project.path_with_namespace}]"
@subject << "[#{@ref_name}]" if action == :push @subject << "[#{@ref_name}]" if action == :push
@subject << " " @subject << " "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment