diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-13 11:53:27 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-13 11:53:27 +0000 |
| commit | 2ec385858f2644c890f8fb4dbe8aa53eb23bd5e9 (patch) | |
| tree | e31d1db36990c436148959022e95883025c56dd6 | |
| parent | 94488269d1c3e117fad4acc9be27af10141a32cf (diff) | |
| download | redmine-2ec385858f2644c890f8fb4dbe8aa53eb23bd5e9.tar.gz redmine-2ec385858f2644c890f8fb4dbe8aa53eb23bd5e9.zip | |
Merged r2722, r2771, r2772 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2883 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/account/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/versions/show.rhtml | 1 | ||||
| -rw-r--r-- | doc/CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/subversion_adapter.rb | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml index 1ddabbaa5..134c587d0 100644 --- a/app/views/account/show.rhtml +++ b/app/views/account/show.rhtml @@ -29,6 +29,7 @@ <% end %> </ul> <% end %> +<%= call_hook :view_account_left_bottom, :user => @user %> </div> <div class="splitcontentright"> @@ -64,6 +65,7 @@ <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %> <% end %> <% end %> +<%= call_hook :view_account_right_bottom, :user => @user %> </div> <% html_title @user.name %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 7e5264562..914bbcc1a 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -1,5 +1,6 @@ <div class="contextual"> <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %> +<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %> </div> <h2><%= h(@version.name) %></h2> diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 5bdda5b41..320b2595a 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -10,6 +10,8 @@ http://www.redmine.org/ * Incoming mail handler : Allow spaces between keywords and colon * Do not require a non-word character after a comma in Redmine links * Include issue hyperlinks in reminder emails +* Prevent nil error when retrieving svn version +* Various plugin hooks added * Fixed: 500 Internal Server Error is raised if add an empty comment to the news * Fixed: Atom links for wiki pages are not correct * Fixed: Atom feeds leak email address diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index 0a96ed654..1c85e845e 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -37,7 +37,7 @@ module Redmine version = nil
shellout(cmd) do |io|
# Read svn version in first returned line
- if m = io.gets.match(%r{((\d+\.)+\d+)})
+ if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
version = m[0].scan(%r{\d+}).collect(&:to_i)
end
end
|