Commit 73e6bdff79d7d02b98c8983630794b9cc52bfd62

Authored by Nathan Broadbent
1 parent 4f3406dc
Exists in master and in 1 other branch production

Adjusted deploy_notification templates. Replaced 'Where' with simple 'REVISION'.…

… Reduces duplication.
app/views/mailer/deploy_notification.html.haml
@@ -19,10 +19,8 @@ @@ -19,10 +19,8 @@
19 %tr 19 %tr
20 %td.content(valign="top") 20 %td.content(valign="top")
21 %div 21 %div
22 - %p.heading WHAT:  
23 - %p  
24 - - revision = @deploy.revision.present? ? content_tag(:span, "@#{@deploy.revision}", :class => "revision") : ""  
25 - = (@app.name + revision).html_safe 22 + %p.heading REVISION:
  23 + %p= @deploy.revision
26 %p.heading WHEN: 24 %p.heading WHEN:
27 %p= @deploy.created_at.to_s(:rfc822) 25 %p= @deploy.created_at.to_s(:rfc822)
28 %p.heading REPOSITORY: 26 %p.heading REPOSITORY:
app/views/mailer/deploy_notification.text.erb
1 <%= @app.name %> was just deployed to <%= @deploy.environment %> by <%= @deploy.username %>. 1 <%= @app.name %> was just deployed to <%= @deploy.environment %> by <%= @deploy.username %>.
2 2
3 -Details:  
4 3
5 - What: <%= @app.name %><%= "@#{@deploy.revision}" unless @deploy.revision.blank? %>  
6 - When: <%= @deploy.created_at.to_s(:rfc822) %>  
7 - Repository: <%= @deploy.repository.blank? ? 'n/a' : @deploy.repository %> 4 +REVISION:
  5 +
  6 +<%= @deploy.revision %>
  7 +
  8 +
  9 +WHEN:
  10 +
  11 +<%= @deploy.created_at.to_s(:rfc822) %>
  12 +
  13 +
  14 +REPOSITORY:
  15 +
  16 +<%= @deploy.repository.blank? ? 'n/a' : @deploy.repository %>
8 17