Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

5 files changed, 12 insertions, 17 deletions

diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index ed6cecdcc3d..4edb0f324dc 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -2,7 +2,7 @@
   = render 'shared/event_filter'
   .controls
     = link_to dashboard_projects_path(rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip', title: 'Subscribe' do
-      = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon')
+      = sprite_icon('rss', css_class: 'gl-icon')
 
 .content_list
 .loading
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index 39fbd9bc097..bc8e3e6ab69 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -9,7 +9,7 @@
   - if current_user
     .page-title-controls
       = render 'shared/new_project_item_select',
-        path: '-/milestones/new', label: 'New milestone',
+        path: '-/milestones/new', label: _('Milestone'),
         include_groups: true, type: :milestones
 
 - if @milestone_states.any? { |name, count| count > 0 }
@@ -23,7 +23,7 @@
       - if current_user
         .page-title-controls
           = render 'shared/new_project_item_select',
-            path: '-/milestones/new', label: 'New milestone',
+            path: '-/milestones/new', label: _('Milestone'),
             include_groups: true, type: :milestones
   - else
     .milestones
@@ -36,5 +36,5 @@
     - if current_user
       .page-title-controls
         = render 'shared/new_project_item_select',
-          path: '-/milestones/new', label: 'New milestone',
+          path: '-/milestones/new', label: _('Milestone'),
           include_groups: true, type: :milestones
diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml
index 0658d548eab..a9a34af3f96 100644
--- a/app/views/dashboard/projects/_blank_state_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml
@@ -11,14 +11,9 @@
         %p
           = _('Projects are where you store your code, access issues, wiki and other features of GitLab.')
   - else
-    .blank-state.gl-display-flex.gl-align-items-center.gl-border-1.gl-border-solid.gl-border-gray-100.gl-rounded-base.gl-mb-5
-      .blank-state-icon
-        = custom_icon("add_new_project", size: 50)
-      .blank-state-body.gl-sm-pl-0.gl-pl-6
-        %h3.gl-font-size-h2.gl-mt-0
-          = _('Create a project')
-        %p
-          = _('If you are added to a project, it will be displayed here.')
+    = render Pajamas::AlertComponent.new(variant: :info, alert_options: { class: 'gl-mb-5 gl-w-full' }) do |c|
+      = c.body do
+        = _("You see projects here when you're added to a group or project.").html_safe
 
   - if current_user.can_create_group?
     = link_to new_group_path, class: link_classes do
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 8d82116bf10..b4668b1e52a 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -1,4 +1,4 @@
-%li.todo{ class: "todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo), data: { url: todo_target_path(todo) } }
+%li.todo.gl-hover-border-blue-200.gl-hover-bg-blue-50.gl-hover-cursor-pointer{ class: "todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo), data: { url: todo_target_path(todo) } }
   .gl-display-flex.gl-flex-direction-row
     .todo-avatar.gl-display-none.gl-sm-display-inline-block
       = author_avatar(todo, size: 40)
@@ -49,13 +49,13 @@
 
     .todo-actions.gl-ml-3
       - if todo.pending?
-        = link_to dashboard_todo_path(todo), method: :delete, class: 'gl-button btn btn-default btn-loading d-flex align-items-center js-done-todo', data: { href: dashboard_todo_path(todo) } do
+        = link_to dashboard_todo_path(todo), method: :delete, class: 'gl-button gl-bg-gray-50 btn btn-default btn-loading d-flex align-items-center js-done-todo', data: { href: dashboard_todo_path(todo) } do
           = gl_loading_icon(inline: true)
           = _('Done')
-        = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button btn btn-default btn-loading d-flex align-items-center js-undo-todo hidden', data: { href: restore_dashboard_todo_path(todo) } do
+        = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button gl-bg-gray-50 btn btn-default btn-loading d-flex align-items-center js-undo-todo hidden', data: { href: restore_dashboard_todo_path(todo) } do
           = gl_loading_icon(inline: true)
           = _('Undo')
       - else
-        = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button btn btn-default btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
+        = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'gl-button gl-bg-gray-50 btn btn-default btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
           = gl_loading_icon(inline: true)
           = _('Add a to do')
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 6bfe18fd3b2..deb1ac9e360 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -93,7 +93,7 @@
       .text-content.gl-text-center
         - if todos_filter_empty?
           %h4
-            = Gitlab.config.gitlab.no_todos_messages.sample
+            = no_todos_messages.sample
           %p
             = (s_("Todos|Are you looking for things to do? Take a look at %{strongStart}%{openIssuesLinkStart}open issues%{openIssuesLinkEnd}%{strongEnd}, contribute to %{strongStart}%{mergeRequestLinkStart}a merge request%{mergeRequestLinkEnd}%{mergeRequestLinkEnd}%{strongEnd}, or mention someone in a comment to automatically assign them a new to-do item.") % { strongStart: '<strong>', strongEnd: '</strong>', openIssuesLinkStart: "<a href=\"#{issues_dashboard_path}\">", openIssuesLinkEnd: '</a>', mergeRequestLinkStart: "<a href=\"#{merge_requests_dashboard_path}\">", mergeRequestLinkEnd: '</a>' }).html_safe
         - else