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
6637c1e4
Commit
6637c1e4
authored
Jun 12, 2013
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Incorporated the two suggestions (h5 and named variables) and fixed the Spinach test.
parent
642f9f4a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
15 deletions
+5
-15
app/views/milestones/_issues.html.haml
app/views/milestones/_issues.html.haml
+2
-4
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+3
-3
features/project/issues/milestones.feature
features/project/issues/milestones.feature
+0
-2
features/steps/project/project_milestones.rb
features/steps/project/project_milestones.rb
+0
-6
No files found.
app/views/milestones/_issues.html.haml
View file @
6637c1e4
.span6
.span6
.ui-box.milestone-issue-filter
.ui-box.milestone-issue-filter
.title
%h5
.title
=
title
%ul
.nav.nav-pills
%li
=
issues
.
first
%ul
.well-list
%ul
.well-list
-
issues
.
second
.
each
do
|
issue
|
-
issues
.
each
do
|
issue
|
%li
{
data:
{
closed:
issue
.
closed?
}}
%li
{
data:
{
closed:
issue
.
closed?
}}
=
link_to
[
@project
,
issue
]
do
=
link_to
[
@project
,
issue
]
do
%span
.badge.badge-info
##{issue.id}
%span
.badge.badge-info
##{issue.id}
...
...
app/views/milestones/show.html.haml
View file @
6637c1e4
...
@@ -56,9 +56,9 @@
...
@@ -56,9 +56,9 @@
.row
.row
=
render
(
:partial
=>
'issues'
,
:object
=>
[
'Unstarted Issues (open and unassigned)'
,
@issues
.
opened
.
unassigned
]
)
=
render
(
partial:
'issues'
,
:locals
=>
{
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
}
)
=
render
(
:partial
=>
'issues'
,
:object
=>
[
'Ongoing Issues (open and assigned) '
,
@issues
.
opened
.
assigned
]
)
=
render
(
partial:
'issues'
,
:locals
=>
{
title:
'Ongoing Issues (open and assigned)'
,
issues:
@issues
.
opened
.
assigned
}
)
.row
.row
.span6
.span6
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
–
–
=
link_to_gfm
truncate
(
merge_request
.
title
,
length:
60
),
[
@project
,
merge_request
]
=
link_to_gfm
truncate
(
merge_request
.
title
,
length:
60
),
[
@project
,
merge_request
]
=
render
(
:partial
=>
'issues'
,
:
object
=>
[
'Completed Issues (closed)'
,
@issues
.
closed
]
)
=
render
(
:partial
=>
'issues'
,
:
locals
=>
{
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
}
)
%hr
%hr
%h6
Participants:
%h6
Participants:
...
...
features/project/issues/milestones.feature
View file @
6637c1e4
...
@@ -22,5 +22,3 @@ Feature: Project Milestones
...
@@ -22,5 +22,3 @@ Feature: Project Milestones
Given
the milestone has open and closed issues
Given
the milestone has open and closed issues
And
I click link
"v2.2"
And
I click link
"v2.2"
Then
I should see 3 issues
Then
I should see 3 issues
When
I click link
"All Issues"
Then
I should see 4 issues
features/steps/project/project_milestones.rb
View file @
6637c1e4
...
@@ -51,11 +51,5 @@ class ProjectMilestones < Spinach::FeatureSteps
...
@@ -51,11 +51,5 @@ class ProjectMilestones < Spinach::FeatureSteps
Then
"I should see 3 issues"
do
Then
"I should see 3 issues"
do
page
.
should
have_selector
(
'.milestone-issue-filter .well-list li'
,
count:
4
)
page
.
should
have_selector
(
'.milestone-issue-filter .well-list li'
,
count:
4
)
page
.
should
have_selector
(
'.milestone-issue-filter .well-list li.hide'
,
count:
1
)
end
Then
"I should see 4 issues"
do
page
.
should
have_selector
(
'.milestone-issue-filter .well-list li'
,
count:
4
)
page
.
should_not
have_selector
(
'.milestone-issue-filter .well-list li.hide'
)
end
end
end
end
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