Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 10 deletions

diff --git a/app/views/projects/commits/_commit_list.html.haml b/app/views/projects/commits/_commit_list.html.haml
index 6ed65d07202..23b25b5dcbd 100644
--- a/app/views/projects/commits/_commit_list.html.haml
+++ b/app/views/projects/commits/_commit_list.html.haml
@@ -2,14 +2,15 @@
 - hidden = @hidden_commit_count
 - commits = Commit.decorate(commits, @project)
 
-.card
-  .card-header
+= render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5'}, body_options: { class: 'gl-py-0'}) do |c|
+  - c.header do
     Commits (#{@total_commit_count})
-  - if hidden > 0
-    %ul.content-list
-      - commits.each do |commit|
-        = render "projects/commits/inline_commit", commit: commit, project: @project
-      %li.warning-row.unstyled
-        #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.
-  - else
-    %ul.content-list= render commits, project: @project, ref: @ref
+  - c.body do
+    - if hidden > 0
+      %ul.content-list
+        - commits.each do |commit|
+          = render "projects/commits/inline_commit", commit: commit, project: @project
+        %li.warning-row.unstyled
+          #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.
+    - else
+      %ul.content-list= render commits, project: @project, ref: @ref