Do not include award emojis in issue view comment_count
Fixes Issue #14431
This commit is contained in:
parent
9cd5e0fc48
commit
5bf47f14b9
|
@ -8,6 +8,7 @@ v 8.7.0 (unreleased)
|
||||||
- Loading of an issue's referenced merge requests and related branches is now done asynchronously (Yorick Peterse)
|
- Loading of an issue's referenced merge requests and related branches is now done asynchronously (Yorick Peterse)
|
||||||
- Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
|
- Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
|
||||||
- Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
|
- Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
|
||||||
|
- Do not include award_emojis in issue and merge_request comment_count !3610 (Lucas Charles)
|
||||||
- All images in discussions and wikis now link to their source files !3464 (Connor Shea).
|
- All images in discussions and wikis now link to their source files !3464 (Connor Shea).
|
||||||
- Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
|
- Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
|
||||||
- Add setting for customizing the list of trusted proxies !3524
|
- Add setting for customizing the list of trusted proxies !3524
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
= icon('thumbs-down')
|
= icon('thumbs-down')
|
||||||
= downvotes
|
= downvotes
|
||||||
|
|
||||||
- note_count = issue.notes.user.count
|
- note_count = issue.notes.user.nonawards.count
|
||||||
- if note_count > 0
|
- if note_count > 0
|
||||||
%li
|
%li
|
||||||
= link_to issue_path(issue) + "#notes" do
|
= link_to issue_path(issue) + "#notes" do
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
= icon('thumbs-down')
|
= icon('thumbs-down')
|
||||||
= downvotes
|
= downvotes
|
||||||
|
|
||||||
- note_count = merge_request.mr_and_commit_notes.user.count
|
- note_count = merge_request.mr_and_commit_notes.user.nonawards.count
|
||||||
- if note_count > 0
|
- if note_count > 0
|
||||||
%li
|
%li
|
||||||
= link_to merge_request_path(merge_request) + "#notes" do
|
= link_to merge_request_path(merge_request) + "#notes" do
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
%li.notes-tab
|
%li.notes-tab
|
||||||
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
|
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
|
||||||
Discussion
|
Discussion
|
||||||
%span.badge= @merge_request.mr_and_commit_notes.user.count
|
%span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
|
||||||
%li.commits-tab
|
%li.commits-tab
|
||||||
= link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
|
= link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
|
||||||
Commits
|
Commits
|
||||||
|
|
|
@ -45,7 +45,7 @@ describe 'Issues', feature: true do
|
||||||
project: project)
|
project: project)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'allows user to select unasigned', js: true do
|
it 'allows user to select unassigned', js: true do
|
||||||
visit edit_namespace_project_issue_path(project.namespace, project, issue)
|
visit edit_namespace_project_issue_path(project.namespace, project, issue)
|
||||||
|
|
||||||
expect(page).to have_content "Assignee #{@user.name}"
|
expect(page).to have_content "Assignee #{@user.name}"
|
||||||
|
@ -64,6 +64,18 @@ describe 'Issues', feature: true do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'Issue info' do
|
||||||
|
it 'excludes award_emoji from comment count' do
|
||||||
|
issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
|
||||||
|
create(:upvote_note, noteable: issue)
|
||||||
|
|
||||||
|
visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
|
||||||
|
|
||||||
|
expect(page).to have_content 'foobar'
|
||||||
|
expect(page.all('.issue-no-comments').first.text).to eq "0"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'Filter issue' do
|
describe 'Filter issue' do
|
||||||
before do
|
before do
|
||||||
['foobar', 'barbaz', 'gitlab'].each do |title|
|
['foobar', 'barbaz', 'gitlab'].each do |title|
|
||||||
|
@ -187,7 +199,7 @@ describe 'Issues', feature: true do
|
||||||
describe 'update assignee from issue#show' do
|
describe 'update assignee from issue#show' do
|
||||||
let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
|
let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
|
||||||
|
|
||||||
context 'by autorized user' do
|
context 'by authorized user' do
|
||||||
|
|
||||||
it 'allows user to select unassigned', js: true do
|
it 'allows user to select unassigned', js: true do
|
||||||
visit namespace_project_issue_path(project.namespace, project, issue)
|
visit namespace_project_issue_path(project.namespace, project, issue)
|
||||||
|
|
|
@ -4,6 +4,20 @@ describe 'Comments', feature: true do
|
||||||
include RepoHelpers
|
include RepoHelpers
|
||||||
include WaitForAjax
|
include WaitForAjax
|
||||||
|
|
||||||
|
describe 'On merge requests page', feature: true do
|
||||||
|
it 'excludes award_emoji from comment count' do
|
||||||
|
merge_request = create(:merge_request)
|
||||||
|
project = merge_request.source_project
|
||||||
|
create(:upvote_note, noteable: merge_request, project: project)
|
||||||
|
|
||||||
|
login_as :admin
|
||||||
|
visit namespace_project_merge_requests_path(project.namespace, project)
|
||||||
|
|
||||||
|
expect(merge_request.mr_and_commit_notes.count).to eq 1
|
||||||
|
expect(page.all('.merge-request-no-comments').first.text).to eq "0"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'On a merge request', js: true, feature: true do
|
describe 'On a merge request', js: true, feature: true do
|
||||||
let!(:merge_request) { create(:merge_request) }
|
let!(:merge_request) { create(:merge_request) }
|
||||||
let!(:project) { merge_request.source_project }
|
let!(:project) { merge_request.source_project }
|
||||||
|
@ -129,6 +143,17 @@ describe 'Comments', feature: true do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'comment info' do
|
||||||
|
it 'excludes award_emoji from comment count' do
|
||||||
|
create(:upvote_note, noteable: merge_request, project: project)
|
||||||
|
|
||||||
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||||
|
|
||||||
|
expect(merge_request.mr_and_commit_notes.count).to eq 2
|
||||||
|
expect(find('.notes-tab span.badge').text).to eq "1"
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'On a merge request diff', js: true, feature: true do
|
describe 'On a merge request diff', js: true, feature: true do
|
||||||
|
|
Loading…
Reference in New Issue