Merge branch 'master' into openstreetbugs

[rails.git] / app / views / changeset / list.html.erb

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 22a798ffe25f4b89db1efa532bb9ea6bff2aa074..5d12aa83794bb1cb7a8a2344acddc298e7f44b00 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,5 +1,5 @@
 <h1><%= @heading %></h1>
 <h1><%= @heading %></h1>

-<p><%= @description %></p>
+<p><%= raw(@description) %></p>

 
 <%= render :partial => 'changeset_paging_nav' %>
 
 
 <%= render :partial => 'changeset_paging_nav' %>
 


@@ -10,8 +10,8 @@
 
 <%= render :partial => 'changeset_paging_nav' %>
 
 
 <%= render :partial => 'changeset_paging_nav' %>
 

-<%= atom_link_to params.merge({ :page => nil, :format => :atom }) %>
+<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>

 
 <% content_for :head do %>
 
 <% content_for :head do %>

-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>

 <% end %>
 <% end %>