Make auto merge emails easier to read

mikeweaver · Dec 31, 2015 · 945ee2f · 945ee2f
1 parent 5a739c2
commit 945ee2f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/app/views/merge_mailer/_merge_list.html.erb b/app/views/merge_mailer/_merge_list.html.erb
@@ -1,8 +1,18 @@
 <% if !merges.empty? %>
-    <h3><%= heading %></h3>
+    <h3><%=
+        if success
+          'Successful Merges:'
+        else
+          'Unsuccessful Merges'
+        end%></h3>
     <% merges.each do |source_branch, target_branches| %>
         <p>
-          Merged <%= render partial: 'shared/branch_link', locals: {repository_name: @repository_name, branch: source_branch} %> into:
+          <%=
+          if success
+            'Merged '
+          else
+            'Failed to merge '
+          end%><%= render partial: 'shared/branch_link', locals: {repository_name: @repository_name, branch: source_branch} %> into:
         </p>
         <% target_branches.each do |target_branch| %>
           <p style="margin-left:20px;margin-top:0px;margin-bottom:0px">

diff --git a/app/views/merge_mailer/_merge_list.text.erb b/app/views/merge_mailer/_merge_list.text.erb
@@ -1,8 +1,18 @@
 <% if !merges.empty? %>
-<%= heading %>
+<%=
+if success
+'Successful Merges:'
+else
+'Unsuccessful Merges'
+end%>
 
 <% merges.each do |source_branch, target_branches| %>
-Merged <%= source_branch.name %> into:
+<%=
+if success
+'Merged '
+else
+'Failed to merge '
+end%><%= source_branch.name %> into:
 <% target_branches.each do |target_branch| %>
     <%= target_branch.name %>
 <% end %>

diff --git a/app/views/merge_mailer/merge_email.html.erb b/app/views/merge_mailer/merge_email.html.erb
@@ -1,6 +1,6 @@
-<%= render partial: 'merge_list', locals: {merges: @successful_merges, heading: 'Successful Merges:'} %>
+<%= render partial: 'merge_list', locals: {merges: @successful_merges, success: true} %>
 
-<%= render partial: 'merge_list', locals: {merges: @unsuccessful_merges, heading: 'Unsuccessful Merges:'} %>
+<%= render partial: 'merge_list', locals: {merges: @unsuccessful_merges, success: false} %>
 
 <p>
 You are receiving this email because you made a commit to the branches listed above in the <%= @repository_name %> repository.<br>

diff --git a/app/views/merge_mailer/merge_email.text.erb b/app/views/merge_mailer/merge_email.text.erb
@@ -1,6 +1,6 @@
-<%= render partial: 'merge_list', locals: {merges: @successful_merges, heading: 'Successful Merges:'} %>
+<%= render partial: 'merge_list', locals: {merges: @successful_merges, success: true} %>
 
-<%= render partial: 'merge_list', locals: {merges: @unsuccessful_merges, heading: 'Unsuccessful Merges:'} %>
+<%= render partial: 'merge_list', locals: {merges: @unsuccessful_merges, success: false} %>
 
 You are receiving this email because you made a commit to the branches listed above in the <%= @repository_name %> repository.
 To unsubscribe, click here: <%= url_for controller: :users, action: :new_unsubscribe, id: @user.id %>