Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

3 files changed, 7 insertions, 7 deletions

diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index 7c948260d4b..ed6cecdcc3d 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -6,4 +6,4 @@
 
 .content_list
 .loading
-  = gl_loading_icon(size: 'md')
+  = render Pajamas::SpinnerComponent.new(size: :md)
diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml
index e0b8850357e..0658d548eab 100644
--- a/app/views/dashboard/projects/_blank_state_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml
@@ -39,7 +39,7 @@
       %p
         = _('Public projects are an easy way to allow everyone to have read-only access.')
 
-  = link_to "https://docs.gitlab.com/", class: link_classes do
+  = link_to Gitlab::Saas::doc_url, class: link_classes do
     .blank-state-icon
       = custom_icon("lightbulb", size: 50)
     .blank-state-body.gl-sm-pl-0.gl-pl-6
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index c932b416b66..8d82116bf10 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -12,7 +12,7 @@
             - if todo.author
               = link_to_author(todo, self_added: todo.self_added?)
             - else
-              (removed)
+              = _('(removed)')
 
         %span.title-item.action-name{ data: { qa_selector: "todo_action_name_content" } }
           = todo_action_name(todo)
@@ -45,17 +45,17 @@
         .todo-body
           .todo-note.break-word
             .md
-              = first_line_in_markdown(todo, :body, 150, project: todo.project)
+              = first_line_in_markdown(todo, :body, 150, project: todo.project, group: todo.group)
 
     .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
           = gl_loading_icon(inline: true)
-          Done
+          = _('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
           = gl_loading_icon(inline: true)
-          Undo
+          = _('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
           = gl_loading_icon(inline: true)
-          Add a to do
+          = _('Add a to do')