diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index f6a457ef9..fff36c0cb 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -47,6 +47,26 @@ table, td, th {
border: 1px solid #bbb;
padding: 4px;
}
+.badge {
+ position:relative;
+ font-weight:bold;
+ font-size: 10px;
+ bottom: 2px;
+ padding: 1px 3px;
+ margin-right: 2px;
+ margin-left: 2px;
+ border-radius: 2px;
+ text-transform: uppercase;
+ text-decoration: none;
+}
+.badge-status-open {
+ color: #205D86;
+ border: 1px solid #205D86;
+}
+.badge-status-closed {
+ color: #1D781D;
+ border: 1px solid #1D781D;
+}
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 58287c658..b46218445 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,4 +1,7 @@
-<%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %>
+
+ <%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %>
+ <%= issue_status_type_badge(issue.status) %>
+
<%= render_email_issue_attributes(issue, user, true) %>
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 3f6e974ca..b676a4503 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -480,6 +480,16 @@ class MailerTest < ActiveSupport::TestCase
end
end
+ def test_issue_add_should_include_issue_status_type_badge
+ issue = Issue.find(1)
+ Mailer.deliver_issue_add(issue)
+
+ mail = last_email
+ assert_select_email do
+ assert_select 'span.badge.badge-status-open', text: 'open'
+ end
+ end
+
def test_issue_edit_subject_should_include_status_changes_if_setting_is_enabled
with_settings :show_status_changes_in_mail_subject => 1 do
issue = Issue.find(2)