5 files changed, 42 insertions, 42 deletions

diff --git a/app/views/dashboard/tasks/_task.html.haml b/app/views/dashboard/tasks/_task.html.haml
deleted file mode 100644
index 164a53dd928..00000000000
--- a/app/views/dashboard/tasks/_task.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-%li{class: "task task-#{task.done? ? 'done' : 'pending'}", id: dom_id(task) }
-  .task-item{class: 'task-block'}
-    = image_tag avatar_icon(task.author_email, 40), class: 'avatar s40', alt:''
-
-    .task-title
-      %span.author_name
-        = link_to_author task
-      %span.task_label
-        = task_action_name(task)
-        = task_target_link_html(task)
-
-      · #{time_ago_with_tooltip(task.created_at)}
-
-    - if task.pending?
-      .task-actions.pull-right
-        = link_to 'Done', [:dashboard, task], method: :delete, class: 'btn'
-
-    .task-body
-      .task-note
-        .md
-          = event_note(task.body, project: task.project)
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
new file mode 100644
index 00000000000..7de703e304f
--- /dev/null
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -0,0 +1,21 @@
+%li{class: "todo todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo) }
+  .todo-item{class: 'todo-block'}
+    = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
+
+    .todo-title
+      %span.author_name
+        = link_to_author todo
+      %span.todo_label
+        = todo_action_name(todo)
+        = todo_target_link_html(todo)
+
+      · #{time_ago_with_tooltip(todo.created_at)}
+
+    - if todo.pending?
+      .todo-actions.pull-right
+        = link_to 'Done', [:dashboard, todo], method: :delete, class: 'btn'
+
+    .todo-body
+      .todo-note
+        .md
+          = event_note(todo.body, project: todo.project)
diff --git a/app/views/dashboard/tasks/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 4b6e3d83e62..a91f8f24f8c 100644
--- a/app/views/dashboard/tasks/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -1,53 +1,53 @@
-- page_title "Tasks"
-- header_title "Tasks", dashboard_tasks_path
+- page_title "Todos"
+- header_title "Todos", dashboard_todos_path
 
 .top-area
   %ul.nav-links
     %li{class: ('active' if params[:state].blank? || params[:state] == 'pending')}
       = link_to page_filter_path(state: 'pending') do
         %span
-          Tasks
+          Todos
         %span{class: 'badge'}
-          = tasks_pending_count
+          = todos_pending_count
     %li{class: ('active' if params[:state] == 'done')}
       = link_to page_filter_path(state: 'done') do
         %span
           Done
         %span{class: 'badge'}
-          = tasks_done_count
+          = todos_done_count
 
-.tasks-filters
+.todos-filters
   .gray-content-block.second-block
     = form_tag page_filter_path(without: [:assignee_id, :milestone_title, :label_name, :scope, :sort]), method: :get, class: 'filter-form' do
       .filter-item.inline
-        = select_tag('project_id', task_projects_options,
+        = select_tag('project_id', todo_projects_options,
           class: 'select2 trigger-submit', include_blank: true,
           data: {placeholder: 'Project'})
       .filter-item.inline
         = users_select_tag(:author_id, selected: params[:author_id],
           placeholder: 'Author', class: 'trigger-submit', any_user: "Any Author", first_user: true, current_user: true)
       .filter-item.inline
-        = select_tag('type', task_types_options,
+        = select_tag('type', todo_types_options,
           class: 'select2 trigger-submit', include_blank: true,
           data: {placeholder: 'Type'})
       .filter-item.inline.actions-filter
-        = select_tag('action_id', task_actions_options,
+        = select_tag('action_id', todo_actions_options,
           class: 'select2 trigger-submit', include_blank: true,
           data: {placeholder: 'Action'})
 
 .prepend-top-default
-  - if @tasks.any?
-    - @tasks.group_by(&:project).each do |group|
+  - if @todos.any?
+    - @todos.group_by(&:project).each do |group|
       .panel.panel-default.panel-small
         - project = group[0]
         .panel-heading
           = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
 
-        %ul.well-list.tasks-list
+        %ul.well-list.todos-list
           = render group[1]
-    = paginate @tasks, theme: "gitlab"
+    = paginate @todos, theme: "gitlab"
   - else
-    .nothing-here-block No tasks to show
+    .nothing-here-block No todos to show
 
 :javascript
   new UsersSelect();
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 3d55c4bba1b..4781ff23507 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -22,9 +22,9 @@
               = 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: 'Tasks', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-              %span.badge.tasks-pending-count
-                = tasks_pending_count
+            = link_to dashboard_todos_path, title: 'Todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+              %span.badge.todos-pending-count
+                = todos_pending_count
           - if current_user.can_create_project?
             %li
               = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 586eff002df..db0cf393922 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -4,12 +4,12 @@
       = icon('home fw')
       %span
         Projects
-  = nav_link(controller: :tasks) do
-    = link_to dashboard_tasks_path, title: 'Tasks' do
+  = nav_link(controller: :todos) do
+    = link_to dashboard_todos_path, title: 'Todos' do
       = icon('bell fw')
       %span
-        Tasks
-        %span.count= number_with_delimiter(tasks_pending_count)
+        Todos
+        %span.count= number_with_delimiter(todos_pending_count)
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do
       = icon('dashboard fw')