summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-22 16:01:10 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-22 16:01:10 +0000
commit4753368d2f1bb62eab76bb3276f0859f8eec140d (patch)
tree73f20e0153913d51d5ba273a960b136c28ce6ee1 /app/models/concerns
parent91335c59fd3a0a1dc5cd83835d086ac1699316b9 (diff)
parent0494930d7a939297a071bb817ad0227da17dda1b (diff)
downloadgitlab-ce-4753368d2f1bb62eab76bb3276f0859f8eec140d.tar.gz
Merge branch 'add_mr_info_to_issues_list' into 'master'
Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/issuable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 5f53c48fc88..c9c6bd24d75 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -16,9 +16,9 @@ module Issuable
include TimeTrackable
# This object is used to gather issuable meta data for displaying
- # upvotes, downvotes and notes count for issues and merge requests
+ # upvotes, downvotes, notes and closing merge requests count for issues and merge requests
# lists avoiding n+1 queries and improving performance.
- IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count)
+ IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count, :merge_requests_count)
included do
cache_markdown_field :title, pipeline: :single_line