Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
a5759710
Commit
a5759710
authored
Jan 06, 2017
by
Ryan Harris
Committed by
Luke "Jared" Bennett
Jan 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved merge conflict in app/views/shared/milestones/_issuables.html.haml
parent
8ab94120
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
0 deletions
+31
-0
app/views/shared/milestones/_issuables.html.haml
app/views/shared/milestones/_issuables.html.haml
+1
-0
changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml
...eleased/25277-milestone-counter-number-with-delimiter.yml
+4
-0
spec/javascripts/fixtures/issuables.html.haml
spec/javascripts/fixtures/issuables.html.haml
+5
-0
spec/javascripts/milestones_spec.js.es6
spec/javascripts/milestones_spec.js.es6
+21
-0
No files found.
app/views/shared/milestones/_issuables.html.haml
View file @
a5759710
...
...
@@ -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
}
...
...
changelogs/unreleased/25277-milestone-counter-number-with-delimiter.yml
0 → 100644
View file @
a5759710
---
title
:
Added number_with_delimiter to counter on milestone panels
merge_request
:
author
:
Ryan Harris
spec/javascripts/fixtures/issuables.html.haml
0 → 100644
View file @
a5759710
.panel.panel-default
.panel-heading
Unstarted Issues (open and unassigned)
.pull-right
1
spec/javascripts/milestones_spec.js.es6
0 → 100644
View file @
a5759710
/*= 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');
});
});
})();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment