summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/dashboard/tasks/index.html.haml4
-rw-r--r--app/views/layouts/header/_default.html.haml2
-rw-r--r--app/views/layouts/nav/_dashboard.html.haml12
3 files changed, 9 insertions, 9 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')