diff options
| -rw-r--r-- | lib/redmine.rb | 2 | ||||
| -rw-r--r-- | test/integration/lib/redmine/menu_manager_test.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb index 142b60888..2d4dd0f7d 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -225,7 +225,7 @@ Redmine::MenuManager.map :application_menu do |menu| menu.push :projects, {:controller => 'projects', :action => 'index'}, :permission => nil, :caption => :label_project_plural - menu.push :activity, {:controller => 'activities', :action => 'index', :id => nil} + menu.push :activity, {:controller => 'activities', :action => 'index'} menu.push( :issues, {:controller => 'issues', :action => 'index'}, diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb index 318bc6129..07fbcc332 100644 --- a/test/integration/lib/redmine/menu_manager_test.rb +++ b/test/integration/lib/redmine/menu_manager_test.rb @@ -126,12 +126,6 @@ class MenuManagerTest < Redmine::IntegrationTest end end - def test_cross_project_menu_should_link_to_global_activity - log_user('dlopper', 'foo') - get '/queries/3/edit' - assert_select 'a.activity[href=?]', '/activity' - end - def test_project_menu_should_show_roadmap_if_subprojects_have_versions Version.delete_all # Create a version in the project "eCookbook Subproject 1" |