Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 11 deletions

diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index b44c773adff..d4efca668eb 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,9 +1,9 @@
 - page_title _("Blame"), @blob.path, @ref
 
-#blob-content-holder.tree-holder
+#blob-content-holder.tree-holder{ data: { testid: 'blob-content-holder' } }
   = render "projects/blob/breadcrumb", blob: @blob, blame: true
 
-  .file-holder
+  .file-holder.gl-overflow-hidden
     = render "projects/blob/header", blob: @blob, blame: true
 
     .file-blame-legend
@@ -20,7 +20,7 @@
       %span.legend-box.legend-box-9
       %span.right-label Older
 
-    .table-responsive.file-content.blame.code{ class: user_color_scheme, data: { qa_selector: 'blame_file_content' } }
+    .table-responsive.file-content.blame.code{ class: "#{user_color_scheme} gl-rounded-0!", data: { qa_selector: 'blame_file_content' } }
       %table
         - current_line = @blame.first_line
         - @blame.groups.each do |blame_group|
@@ -59,5 +59,11 @@
 
           - current_line += line_count
 
-  - if blame_pagination
-    = paginate(blame_pagination, theme: "gitlab")
+    - if @blame_pagination
+      .gl-display-flex.gl-justify-content-center.gl-flex-direction-column.gl-align-items-center.gl-p-3.gl-bg-gray-50.gl-border-t-solid.gl-border-t-1.gl-border-gray-100
+        = _('For faster browsing, not all history is shown.')
+        = render Pajamas::ButtonComponent.new(href: namespace_project_blame_path(namespace_id: @project.namespace, project_id: @project, id: @id, no_pagination: true), size: :small, button_options: { class: 'gl-mt-3' }) do |c|
+          = _('View entire blame')
+
+  - if @blame_pagination
+    = paginate(@blame_pagination, theme: "gitlab")
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index e141a006415..9c07713b9f8 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/app/views/projects/blob/_header.html.haml
@@ -6,12 +6,6 @@
   .file-actions.gl-display-flex.gl-align-items-center.gl-flex-wrap.gl-md-justify-content-end<
     = render 'projects/blob/viewer_switcher', blob: blob unless blame
     = render 'shared/web_ide_button', blob: blob
-    - unless blame
-      .btn-group{ role: "group", class: ("gl-ml-3" if current_user) }>
-        = render_if_exists 'projects/blob/header_file_locks_link'
-        - if current_user
-          = replace_blob_link(@project, @ref, @path, blob: blob)
-          = delete_blob_link(@project, @ref, @path, blob: blob)
     .btn-group.gl-ml-3{ role: "group" }
       = copy_blob_source_button(blob) unless blame
       = open_raw_blob_button(blob)