Merge branch 'release-v1.5.0' into stable

app/views/auth_sources/index.html.erb

@@ -15,10 +15,10 @@
   <tbody>
 <% for source in @auth_sources %>
   <tr class="<%= cycle("odd", "even") %>">
-    <td><%= link_to source.name, :action => 'edit', :id => source%></td>
-    <td align="center"><%= source.auth_method_name %></td>
-    <td align="center"><%= source.host %></td>    
-    <td align="center"><%= source.users.count %></td>
+    <td><%= link_to(h(source.name), :action => 'edit', :id => source)%></td>
+    <td align="center"><%= h source.auth_method_name %></td>
+    <td align="center"><%= h source.host %></td>
+    <td align="center"><%= h source.users.count %></td>
     <td class="buttons">
     	<%= link_to l(:button_test), :action => 'test_connection', :id => source %>
     	<%= link_to l(:button_delete), { :action => 'destroy', :id => source },

app/views/wiki/show.rhtml

@@ -49,6 +49,7 @@
   <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
   <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
   <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
+  <%= call_hook(:view_wiki_show_other_formats, {:link_builder => f, :url_params => {:id => @page.title, :version => @content.version}}) %>
 <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
 
 <% content_for :header_tags do %>

doc/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = ChiliProject changelog
 
+== 2011-06-27 v1.5.0
+
+* Bug #490: XSS in app/views/auth_sources/index.html.erb
+* Feature #488: Hook for additional formats on Wiki#show page
+
 == 2011-05-27 v1.4.0
 
 * Bug #81: Replace favicon

lib/redmine/version.rb

@@ -3,7 +3,7 @@ require 'rexml/document'
 module Redmine
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 4
+    MINOR = 5
     PATCH = 0 
     TINY  = PATCH # Redmine compat