From a57597108fdc3d05a1996b2e09b1d0f56acc57fc Mon Sep 17 00:00:00 2001
From: Ryan Harris <harrisryan1@gmail.com>
Date: Fri, 6 Jan 2017 11:33:17 -0500
Subject: [PATCH] Resolved merge conflict in
app/views/shared/milestones/_issuables.html.haml
---
.../shared/milestones/_issuables.html.haml | 1 +
...ilestone-counter-number-with-delimiter.yml | 4 ++++
spec/javascripts/fixtures/issuables.html.haml | 5 +++++
spec/javascripts/milestones_spec.js.es6 | 21 +++++++++++++++++++
4 files changed, 31 insertions(+)
create mode 100644 changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml
create mode 100644 spec/javascripts/fixtures/issuables.html.haml
create mode 100644 spec/javascripts/milestones_spec.js.es6
diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml
index 15ff5b8a27e..c8fd45c4319 100644
--- a/app/views/shared/milestones/_issuables.html.haml
+++ b/app/views/shared/milestones/_issuables.html.haml
@@ -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 }
diff --git a/changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml b/changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml
new file mode 100644
index 00000000000..0c9853de3b6
--- /dev/null
+++ b/changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml
@@ -0,0 +1,4 @@
+---
+title: Added number_with_delimiter to counter on milestone panels
+merge_request:
+author: Ryan Harris
diff --git a/spec/javascripts/fixtures/issuables.html.haml b/spec/javascripts/fixtures/issuables.html.haml
new file mode 100644
index 00000000000..42daf8508d9
--- /dev/null
+++ b/spec/javascripts/fixtures/issuables.html.haml
@@ -0,0 +1,5 @@
+.panel.panel-default
+ .panel-heading
+ Unstarted Issues (open and unassigned)
+ .pull-right
+ 1
diff --git a/spec/javascripts/milestones_spec.js.es6 b/spec/javascripts/milestones_spec.js.es6
new file mode 100644
index 00000000000..7c1f9cbde12
--- /dev/null
+++ b/spec/javascripts/milestones_spec.js.es6
@@ -0,0 +1,21 @@
+/*= 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');
+ });
+ });
+})();
--
GitLab