##// END OF EJS Templates
Merged r2722, r2771, r2772 from trunk....
Jean-Philippe Lang -
r2769:2ec385858f26
parent child
Show More
@@ -29,6 +29,7
29 <% end %>
29 <% end %>
30 </ul>
30 </ul>
31 <% end %>
31 <% end %>
32 <%= call_hook :view_account_left_bottom, :user => @user %>
32 </div>
33 </div>
33
34
34 <div class="splitcontentright">
35 <div class="splitcontentright">
@@ -64,6 +65,7
64 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
65 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
65 <% end %>
66 <% end %>
66 <% end %>
67 <% end %>
68 <%= call_hook :view_account_right_bottom, :user => @user %>
67 </div>
69 </div>
68
70
69 <% html_title @user.name %>
71 <% html_title @user.name %>
@@ -1,5 +1,6
1 <div class="contextual">
1 <div class="contextual">
2 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
2 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
3 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
3 </div>
4 </div>
4
5
5 <h2><%= h(@version.name) %></h2>
6 <h2><%= h(@version.name) %></h2>
@@ -10,6 +10,8 http://www.redmine.org/
10 * Incoming mail handler : Allow spaces between keywords and colon
10 * Incoming mail handler : Allow spaces between keywords and colon
11 * Do not require a non-word character after a comma in Redmine links
11 * Do not require a non-word character after a comma in Redmine links
12 * Include issue hyperlinks in reminder emails
12 * Include issue hyperlinks in reminder emails
13 * Prevent nil error when retrieving svn version
14 * Various plugin hooks added
13 * Fixed: 500 Internal Server Error is raised if add an empty comment to the news
15 * Fixed: 500 Internal Server Error is raised if add an empty comment to the news
14 * Fixed: Atom links for wiki pages are not correct
16 * Fixed: Atom links for wiki pages are not correct
15 * Fixed: Atom feeds leak email address
17 * Fixed: Atom feeds leak email address
@@ -37,7 +37,7 module Redmine
37 version = nil
37 version = nil
38 shellout(cmd) do |io|
38 shellout(cmd) do |io|
39 # Read svn version in first returned line
39 # Read svn version in first returned line
40 if m = io.gets.match(%r{((\d+\.)+\d+)})
40 if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
41 version = m[0].scan(%r{\d+}).collect(&:to_i)
41 version = m[0].scan(%r{\d+}).collect(&:to_i)
42 end
42 end
43 end
43 end
General Comments 0
You need to be logged in to leave comments. Login now