Commit a5759710 authored by Ryan Harris's avatar Ryan Harris Committed by Luke "Jared" Bennett

Resolved merge conflict in app/views/shared/milestones/_issuables.html.haml

parent 8ab94120
......@@ -9,6 +9,7 @@
- if show_counter
.right
= issuables.size
.pull-right= number_with_delimiter(issuables.size)
- class_prefix = dom_class(issuables).pluralize
%ul{ class: "well-list #{class_prefix}-sortable-list", id: "#{class_prefix}-list-#{id}", "data-state" => id }
......
---
title: Added number_with_delimiter to counter on milestone panels
merge_request:
author: Ryan Harris
.panel.panel-default
.panel-heading
Unstarted Issues (open and unassigned)
.pull-right
1
/*= require jquery */
(() => {
describe('MilestonePanel', () => {
const issuesCount = '.pull-right';
const fixtureTemplate = 'issuables.html';
function setIssuesCount(newCount) {
$(issuesCount).text(newCount);
}
fixture.preload(fixtureTemplate);
beforeEach(() => {
fixture.load(fixtureTemplate);
});
it('should add delimiter to the issues count', () => {
setIssuesCount(1000);
expect($(issuesCount).text()).toEqual('1,000');
});
});
})();
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