Mercurial > hg > soundsoftware-site
changeset 1301:e9f9943f02f9 redmine-2.2-integration
Merge from branch "cannam"
| author | Chris Cannam |
|---|---|
| date | Fri, 14 Jun 2013 10:27:07 +0100 |
| parents | 0a574315af3e (current diff) 598af7ed80ca (diff) |
| children | 537026b96b8b |
| files | config/environment.rb lib/redmine.rb |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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