Merge branch 'mr-approvals-on-mr-list' into 'master'

Display Merge Request approval counts in Merge Request list

Closes #1317

See merge request gitlab-org/gitlab-ee!9142

app/controllers/concerns/issuable_collections.rb

@@ -200,3 +200,5 @@ module IssuableCollections
                                 end
   end
 end
+
+IssuableCollections.prepend(EE::IssuableCollections)

app/views/projects/merge_requests/_merge_request.html.haml

@@ -56,6 +56,7 @@
         - if merge_request.assignee
           %li
             = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: _('Assigned to :name'))
+        = render_if_exists 'projects/merge_requests/approvals_count', merge_request: merge_request
 
         = render 'shared/issuable_meta_data', issuable: merge_request
 

ee/app/controllers/concerns/ee/issuable_collections.rb

+# frozen_string_literal: true
+
+module EE
+  module IssuableCollections
+    extend ActiveSupport::Concern
+    extend ::Gitlab::Utils::Override
+
+    override :preload_for_collection
+    def preload_for_collection
+      @preload_for_collection ||= case collection_type
+                                  when 'MergeRequest'
+                                    super.push(:approvals)
+                                  else
+                                    super
+                                  end
+    end
+  end
+end

ee/app/models/concerns/approvable.rb

@@ -19,6 +19,10 @@ module Approvable
     approvals_left < 1
   end
 
+  def approvals_given
+    approvals.size
+  end
+
   # Number of approvals remaining (excluding existing approvals) before the MR is
   # considered approved. If there are fewer potential approvers than approvals left,
   # users should either reduce the number of approvers on projects and/or merge

ee/app/views/projects/merge_requests/_approvals_count.html.haml

+- if merge_request.approval_needed?
+  %li.d-none.d-sm-inline-block.has-tooltip{ title: _('Approvals'), class: ('text-success' if merge_request.approved?) }
+    = sprite_icon('approval', size: 16, css_class: 'align-middle')
+    = merge_request.approvals_given
+     of 
+    = merge_request.approvals_required

ee/changelogs/unreleased/mr-approvals-on-mr-list.yml

+---
+title: Shows the approval given/required counts and its status for each MR when
+  viewing the Merge Requests page
+merge_request: 9142
+author: Glavin Wiechert, Andy Steele
+type: added

locale/gitlab.pot

@@ -892,6 +892,9 @@ msgstr ""
 msgid "Apply suggestion"
 msgstr ""
 
+msgid "Approvals"
+msgstr ""
+
 msgid "Approvals required"
 msgstr ""