Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

4 files changed, 9 insertions, 8 deletions

diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index dd9fd34f284..2111b66d26e 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -14,7 +14,7 @@
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set
 
-= render 'shared/issuable/search_bar', type: :merge_requests
+= render 'shared/issuable/search_bar', type: :merge_requests, disable_target_branch: true
 
 - if current_user && @no_filters_set
   = render 'shared/dashboard/no_filter_selected'
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index a0c1c314a85..923e78ad360 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -1,6 +1,7 @@
 - @hide_top_links = true
 - page_title _('Milestones')
 - header_title _('Milestones'), dashboard_milestones_path
+- add_page_specific_style 'page_bundles/milestone'
 
 .page-title-holder.d-flex.align-items-center
   %h1.page-title= _('Milestones')
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 82abb9b3b8a..6fb387ecca3 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -2,7 +2,7 @@
   .todo-avatar
     = author_avatar(todo, size: 40)
 
-  .todo-item.todo-block.align-self-center
+  .todo-item.todo-block.align-self-center{ data: { qa_selector: "todo_item_container" } }
     .todo-title
       - if todo_author_display?(todo)
         = todo_target_state_pill(todo)
@@ -13,7 +13,7 @@
           - else
             (removed)
 
-      %span.title-item.action-name
+      %span.title-item.action-name{ data: { qa_selector: "todo_action_name_content" } }
         = todo_action_name(todo)
 
       %span.title-item.todo-label.todo-target-link
@@ -22,7 +22,7 @@
         - else
           = _("(removed)")
 
-      %span.title-item.todo-target-title
+      %span.title-item.todo-target-title{ data: { qa_selector: "todo_target_title_content" } }
         = todo_target_title(todo)
 
       %span.title-item.todo-project.todo-label
@@ -31,7 +31,7 @@
 
       - if todo.self_assigned?
         %span.title-item.action-name
-          to yourself
+          = todo_self_addressing(todo)
 
       %span.title-item
         ·
@@ -57,5 +57,5 @@
   - else
     .todo-actions
       = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
-        Add a To Do
+        Add a to do
         %span.spinner.ml-1
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 9c6a6be1bc3..56506370ee0 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -3,7 +3,7 @@
 - header_title _("To-Do List"), dashboard_todos_path
 
 = render_dashboard_gold_trial(current_user)
-= stylesheet_link_tag 'page_bundles/todos'
+- add_page_specific_style 'page_bundles/todos'
 
 .page-title-holder.d-flex.align-items-center
   %h1.page-title= _('To-Do List')
@@ -83,7 +83,7 @@
 
 .todos-list-container.js-todos-all
   - if @todos.any?
-    .js-todos-list-container
+    .js-todos-list-container{ data: { qa_selector: "todos_list_container" } }
       .js-todos-options{ data: { per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages } }
         .card.card-without-border.card-without-margin
           %ul.content-list.todos-list