GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 6b92236e authored by Douwe Maan's avatar Douwe Maan

Don't include system notes in issue/MR comment count.

parent bc4e2518
...@@ -27,6 +27,7 @@ v 7.10.0 (unreleased) ...@@ -27,6 +27,7 @@ v 7.10.0 (unreleased)
- Restrict permissions on backup files - Restrict permissions on backup files
- Improve oauth accounts UI in profile page - Improve oauth accounts UI in profile page
- Add ability to unlink connected accounts - Add ability to unlink connected accounts
- Don't include system notes in issue/MR comment count.
v 7.9.0 v 7.9.0
- Add HipChat integration documentation (Stan Hu) - Add HipChat integration documentation (Stan Hu)
......
...@@ -48,6 +48,7 @@ class Note < ActiveRecord::Base ...@@ -48,6 +48,7 @@ class Note < ActiveRecord::Base
scope :inline, ->{ where("line_code IS NOT NULL") } scope :inline, ->{ where("line_code IS NOT NULL") }
scope :not_inline, ->{ where(line_code: [nil, '']) } scope :not_inline, ->{ where(line_code: [nil, '']) }
scope :system, ->{ where(system: true) } scope :system, ->{ where(system: true) }
scope :user, ->{ where(system: false) }
scope :common, ->{ where(noteable_type: ["", nil]) } scope :common, ->{ where(noteable_type: ["", nil]) }
scope :fresh, ->{ order(created_at: :asc, id: :asc) } scope :fresh, ->{ order(created_at: :asc, id: :asc) }
scope :inc_author_project, ->{ includes(:project, :author) } scope :inc_author_project, ->{ includes(:project, :author) }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- note_count = @note_counts.fetch(commit.id, 0) - note_count = @note_counts.fetch(commit.id, 0)
- else - else
- notes = project.notes.for_commit_id(commit.id) - notes = project.notes.for_commit_id(commit.id)
- note_count = notes.count - note_count = notes.user.count
- if note_count > 0 - if note_count > 0
%span.light %span.light
......
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
- if issue.closed? - if issue.closed?
%span %span
CLOSED CLOSED
- if issue.notes.any? - note_count = issue.notes.user.count
- if note_count > 0
&nbsp; &nbsp;
%span %span
%i.fa.fa-comments %i.fa.fa-comments
= issue.notes.count = note_count
.issue-info .issue-info
= link_to "##{issue.iid}", issue_path(issue), class: "light" = link_to "##{issue.iid}", issue_path(issue), class: "light"
......
...@@ -16,11 +16,12 @@ ...@@ -16,11 +16,12 @@
%span.label-branch< %span.label-branch<
%i.fa.fa-code-fork %i.fa.fa-code-fork
%span= merge_request.target_branch %span= merge_request.target_branch
- if merge_request.notes.any? - note_count = merge_request.mr_and_commit_notes.user.count
- if note_count > 0
&nbsp; &nbsp;
%span %span
%i.fa.fa-comments %i.fa.fa-comments
= merge_request.mr_and_commit_notes.count = note_count
.merge-request-info .merge-request-info
= link_to "##{merge_request.iid}", merge_request_path(merge_request), class: "light" = link_to "##{merge_request.iid}", merge_request_path(merge_request), class: "light"
- if merge_request.assignee - if merge_request.assignee
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
= link_to merge_request_path(@merge_request) do = link_to merge_request_path(@merge_request) do
%i.fa.fa-comments %i.fa.fa-comments
Discussion Discussion
%span.badge= @merge_request.mr_and_commit_notes.count %span.badge= @merge_request.mr_and_commit_notes.user.count
%li.commits-tab{data: {action: 'commits'}} %li.commits-tab{data: {action: 'commits'}}
= link_to merge_request_path(@merge_request), title: 'Commits' do = link_to merge_request_path(@merge_request), title: 'Commits' do
%i.fa.fa-history %i.fa.fa-history
......
...@@ -67,7 +67,7 @@ def wiki_blobs ...@@ -67,7 +67,7 @@ def wiki_blobs
end end
def notes def notes
Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC') Note.where(project_id: limit_project_ids).user.search(query).order('updated_at DESC')
end end
def limit_project_ids def limit_project_ids
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment