Merge remote-tracking branch 'upstream/pull/2177'

[rails.git] / app / views / notifier / gpx_failure.html.erb

diff --git a/app/views/notifier/gpx_failure.html.erb b/app/views/notifier/gpx_failure.html.erb
index d1319acbd1286bff9e0f106aee025481c3747a50..dace1852264604c2a2a38e48b497c54a2b130d50 100644 (file)
--- a/app/views/notifier/gpx_failure.html.erb
+++ b/app/views/notifier/gpx_failure.html.erb
@@ -1,18 +1,16 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t'notifier.gpx_notification.greeting' %></p>
+<p><%= t'notifier.gpx_notification.greeting' %></p>
 
-  <p>
-    <%= render :partial => "gpx_description" %>
-    <%= t'notifier.gpx_notification.failure.failed_to_import' %>
-  </p>
+<p>
+  <%= render :partial => "gpx_description" %>
+  <%= t'notifier.gpx_notification.failure.failed_to_import' %>
+</p>
 
-  <blockquote>
-    <%= @error %>
-  </blockquote>
+<blockquote>
+  <%= @error %>
+</blockquote>
 
-  <p>
-    <%= t'notifier.gpx_notification.failure.more_info_1' %>
-    <%= t'notifier.gpx_notification.failure.more_info_2' %>
-    <%= t'notifier.gpx_notification.failure.import_failures_url' %>
-  </p>
-<% end %>
+<p>
+  <%= t'notifier.gpx_notification.failure.more_info_1' %>
+  <%= t'notifier.gpx_notification.failure.more_info_2' %>
+  <%= t'notifier.gpx_notification.failure.import_failures_url' %>
+</p>