diff options
| author | Alexander Koval <al3xander.koval@gmail.com> | 2019-02-26 17:13:45 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-26 17:13:45 +0000 |
| commit | 35c10922820e3e07a5c571e3ad81e90045b2da2b (patch) | |
| tree | 45351a6a7960a0c8d156d51a7af46d29840ab5d1 /app/models | |
| parent | 3a29b6af828da63ff7142183135d5ddbbd90d940 (diff) | |
| download | gitlab-ce-35c10922820e3e07a5c571e3ad81e90045b2da2b.tar.gz | |
Reduce code duplication
Move logic of obtaining Issuable data to separate method
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/issuable.rb | 6 | ||||
| -rw-r--r-- | app/models/issue.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 429a63f83cc..670103bc3f3 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -28,7 +28,7 @@ module Issuable # This object is used to gather issuable meta data for displaying # 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, :merge_requests_count) + IssuableMeta = Struct.new(:upvotes, :downvotes, :user_notes_count, :merge_requests_count) included do cache_markdown_field :title, pipeline: :single_line @@ -36,8 +36,8 @@ module Issuable redact_field :description - belongs_to :author, class_name: "User" - belongs_to :updated_by, class_name: "User" + belongs_to :author, class_name: 'User' + belongs_to :updated_by, class_name: 'User' belongs_to :last_edited_by, class_name: 'User' belongs_to :milestone diff --git a/app/models/issue.rb b/app/models/issue.rb index 0b46e949052..071ad50fddc 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -263,6 +263,10 @@ class Issue < ActiveRecord::Base end # rubocop: enable CodeReuse/ServiceClass + def merge_requests_count + merge_requests_closing_issues.count + end + private def ensure_metrics |