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
7683efc6
Commit
7683efc6
authored
Aug 02, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added ability to close milestone with opened issues. UI for milestone page improved
parent
b6d0dd87
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
28 deletions
+33
-28
.gitignore
.gitignore
+1
-0
app/assets/stylesheets/gitlab_bootstrap/lists.scss
app/assets/stylesheets/gitlab_bootstrap/lists.scss
+9
-0
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+1
-1
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+1
-2
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+21
-25
No files found.
.gitignore
View file @
7683efc6
...
...
@@ -30,3 +30,4 @@ vendor/bundle/*
rails_best_practices_output.html
doc/code/*
.secret
*.log
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file @
7683efc6
...
...
@@ -83,4 +83,13 @@ ul.bordered-list {
a
{
color
:
#777
;
}
}
}
&
.top-list
{
li
:first-child
{
padding-top
:
0
;
h4
,
h5
{
margin-top
:
0
;
}
}
}
}
app/views/dashboard/projects.html.haml
View file @
7683efc6
...
...
@@ -36,7 +36,7 @@
=
label
.
name
.span9
%ul
.bordered-list.my-projects
%ul
.bordered-list.my-projects
.top-list
-
@projects
.
each
do
|
project
|
%li
%h4
.project-title
...
...
app/views/projects/milestones/_milestone.html.haml
View file @
7683efc6
...
...
@@ -4,8 +4,7 @@
=
link_to
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn btn-small edit-milestone-link grouped"
do
%i
.icon-edit
Edit
-
if
milestone
.
can_be_closed?
=
link_to
'Close'
,
project_milestone_path
(
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-small btn-remove"
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-small btn-remove"
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
-
if
milestone
.
expired?
and
not
milestone
.
closed?
...
...
app/views/projects/milestones/show.html.haml
View file @
7683efc6
=
render
"projects/issues/head"
.row
.span6
%h3
.page-title
%h3
.page-title
Milestone ##{@milestone.id}
%small
=
@milestone
.
expires_at
.back-link
=
link_to
project_milestones_path
(
@project
)
do
←
To milestones list
.span6
.pull-right
-
unless
@milestone
.
closed?
=
link_to
new_project_issue_path
(
@project
,
issue:
{
milestone_id:
@milestone
.
id
}),
class:
"btn btn-small grouped"
,
title:
"New Issue"
do
%i
.icon-plus
New Issue
=
link_to
'Browse Issues'
,
project_issues_path
(
@milestone
.
project
,
milestone_id:
@milestone
.
id
),
class:
"btn edit-milestone-link small grouped"
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
=
link_to
edit_project_milestone_path
(
@project
,
@milestone
),
class:
"btn btn-small
grouped"
do
=
link_to
edit_project_milestone_path
(
@project
,
@milestone
),
class:
"btn
grouped"
do
%i
.icon-edit
Edit
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-remove"
-
if
@milestone
.
issues
.
any?
&&
@milestone
.
can_be_closed?
.alert.alert-success
%span
All issues for this milestone are closed. You may close milestone now.
.back-link
=
link_to
project_milestones_path
(
@project
)
do
←
To milestones list
-
if
@milestone
.
can_be_closed?
%hr
%p
%span
All issues for this milestone are closed. You may close milestone now.
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-small btn-remove"
.ui-box.ui-box-show
.ui-box-head
...
...
@@ -69,6 +60,11 @@
Participants
%span
.badge
=
@users
.
count
.pull-right
=
link_to
new_project_issue_path
(
@project
,
issue:
{
milestone_id:
@milestone
.
id
}),
class:
"btn btn-small grouped"
,
title:
"New Issue"
do
%i
.icon-plus
New Issue
=
link_to
'Browse Issues'
,
project_issues_path
(
@milestone
.
project
,
milestone_id:
@milestone
.
id
),
class:
"btn btn-small edit-milestone-link grouped"
.tab-content
.tab-pane.active
#tab-issues
...
...
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