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

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

diff --git a/app/views/notifier/email_confirm.html.erb b/app/views/notifier/email_confirm.html.erb
index 2afbfcbf62595cc03554d245b6a6c0298c13df31..57359ef599bb506fe0b0041b99a31a90bd81bd5c 100644 (file)
--- a/app/views/notifier/email_confirm.html.erb
+++ b/app/views/notifier/email_confirm.html.erb
@@ -1,7 +1,7 @@
-<p style="margin: 0"><%= t 'notifier.email_confirm_html.greeting' %></p>
+<p><%= t "notifier.email_confirm_html.greeting" %></p>
 
-<p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => SERVER_URL, :new_address => @address %></p>
+<p><%= t "notifier.email_confirm_html.hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>
 
-<p><%= t 'notifier.email_confirm_html.click_the_link' %></p>
+<p><%= t "notifier.email_confirm_html.click_the_link" %></p>
 
-<p><a href="<%= @url %>" style="white-space: nowrap"><%= @url %></a></p>
+<p><a href="<%= @url %>"><%= @url %></a></p>