Skip to content

Commit

Permalink
Fix duplicate link in conflict email
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeweaver committed Dec 31, 2015
1 parent 75efce2 commit 5a739c2
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion app/views/conflicts_mailer/_conflict.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ end %>
conflicts with
<%= render partial: 'shared/branch_link', locals: {repository_name: @repository_name, branch: branch_b} %>
<a href="https://github.com/<%= @repository_name %>/compare/<%= branch_a.name %>...<%= branch_b.name %>" style="text-decoration: none;">(diff)</a>
<a href="https://github.com/<%= @repository_name %>/compare/<%= branch_a.name %>...<%= branch_b.name %>" style="text-decoration: none;">(diff)</a>
<%= link_to 'suppress', { controller: :suppressions, action: :new, conflict_id: conflict.id, user_id: @user.id }, { style: 'text-decoration: none;' } %>
<% end %>

0 comments on commit 5a739c2

Please sign in to comment.