# HG changeset patch # User Chris Cannam # Date 1371202027 -3600 # Node ID e9f9943f02f93fd36714e78863ecd055af715bf0 # Parent 0a574315af3eab702b0074a5813cbf4f8ba280a4# Parent 598af7ed80caee6d71ffc7338cf71724421548c8 Merge from branch "cannam" diff -r 0a574315af3e -r e9f9943f02f9 extra/soundsoftware/SoundSoftware.pm --- a/extra/soundsoftware/SoundSoftware.pm Fri Jun 14 09:07:32 2013 +0100 +++ b/extra/soundsoftware/SoundSoftware.pm Fri Jun 14 10:27:07 2013 +0100 @@ -550,7 +550,9 @@ $name = $repo; } - my $realm = '"Mercurial repository for ' . "'$name'" . '"'; +# my $realm = '"Mercurial repository for ' . "'$name'" . '"'; +# see #577: + my $realm = '"Mercurial repository for ' . "$name" . '"'; $realm; } diff -r 0a574315af3e -r e9f9943f02f9 lib/redmine.rb --- a/lib/redmine.rb Fri Jun 14 09:07:32 2013 +0100 +++ b/lib/redmine.rb Fri Jun 14 10:27:07 2013 +0100 @@ -157,7 +157,7 @@ Redmine::MenuManager.map :top_menu do |menu| menu.push :home, :home_path menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } - menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural + menu.push :projects, { :controller => 'projects', :action => 'explore' }, :caption => :label_project_plural menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true menu.push :help, Redmine::Info.help_url, :last => true end