diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-18 20:25:46 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-20 12:12:05 -0200 |
| commit | a57bf9bd39816cebec5da3da35a1aabbf7462069 (patch) | |
| tree | e15c5fd7f02b7cc008ff9035a16e76c76aa710d4 | |
| parent | fc3f8a8ff75a09aae62b2a56c7f78fd9d21d2af3 (diff) | |
| download | gitlab-ce-a57bf9bd39816cebec5da3da35a1aabbf7462069.tar.gz | |
Rename menu item and page 'Task queue' to 'Tasks'
| -rw-r--r-- | app/views/dashboard/tasks/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 12 | ||||
| -rw-r--r-- | features/dashboard/tasks.feature (renamed from features/dashboard/task_queue.feature) | 2 | ||||
| -rw-r--r-- | features/steps/dashboard/tasks.rb (renamed from features/steps/dashboard/task_queue.rb) | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/app/views/dashboard/tasks/index.html.haml b/app/views/dashboard/tasks/index.html.haml index 16e7b4ae0c5..949006be886 100644 --- a/app/views/dashboard/tasks/index.html.haml +++ b/app/views/dashboard/tasks/index.html.haml @@ -1,5 +1,5 @@ -- page_title "Task Queue" -- header_title "Task Queue", dashboard_tasks_path +- page_title "Tasks" +- header_title "Tasks", dashboard_tasks_path .top-area %ul.nav-links diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index d3aec9ae202..3d55c4bba1b 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -22,7 +22,7 @@ = link_to admin_root_path, title: 'Admin Area', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('wrench fw') %li - = link_to dashboard_tasks_path, title: 'Task Queue', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do + = link_to dashboard_tasks_path, title: 'Tasks', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do %span.badge.tasks-pending-count = tasks_pending_count - if current_user.can_create_project? diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 0b59577ad66..586eff002df 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -4,6 +4,12 @@ = icon('home fw') %span Projects + = nav_link(controller: :tasks) do + = link_to dashboard_tasks_path, title: 'Tasks' do + = icon('bell fw') + %span + Tasks + %span.count= number_with_delimiter(tasks_pending_count) = nav_link(path: 'dashboard#activity') do = link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do = icon('dashboard fw') @@ -31,12 +37,6 @@ %span Merge Requests %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count) - = nav_link(path: 'dashboard#tasks') do - = link_to dashboard_tasks_path, title: 'Task Queue' do - = icon('bell fw') - %span - Task Queue - %span.count= number_with_delimiter(tasks_pending_count) = nav_link(controller: :snippets) do = link_to dashboard_snippets_path, title: 'Snippets' do = icon('clipboard fw') diff --git a/features/dashboard/task_queue.feature b/features/dashboard/tasks.feature index 8972a148289..9d4f386f7dd 100644 --- a/features/dashboard/task_queue.feature +++ b/features/dashboard/tasks.feature @@ -1,5 +1,5 @@ @dashboard -Feature: Dashboard Task Queue +Feature: Dashboard Tasks Background: Given I sign in as a user And I own project "Shop" diff --git a/features/steps/dashboard/task_queue.rb b/features/steps/dashboard/tasks.rb index 6ff0aff6c21..556aa41bad9 100644 --- a/features/steps/dashboard/task_queue.rb +++ b/features/steps/dashboard/tasks.rb @@ -1,4 +1,4 @@ -class Spinach::Features::DashboardTaskQueue < Spinach::FeatureSteps +class Spinach::Features::DashboardTasks < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject |