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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9d09bd08
Commit
9d09bd08
authored
Jun 02, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Due date can be removed from milestones
Closes #15063
parent
a9a9f19b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
7 deletions
+19
-7
CHANGELOG
CHANGELOG
+2
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-0
app/assets/javascripts/due_date_select.js.coffee
app/assets/javascripts/due_date_select.js.coffee
+15
-0
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+1
-7
No files found.
CHANGELOG
View file @
9d09bd08
...
...
@@ -73,6 +73,8 @@ v 8.8.5 (unreleased)
v 8.8.4
- Fix LDAP-based login for users with 2FA enabled. !4493
- Added descriptions to notification settings dropdown
- Due date can be removed from milestones
v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
9d09bd08
...
...
@@ -29,6 +29,7 @@ class Dispatcher
new
Todos
()
when
'projects:milestones:new'
,
'projects:milestones:edit'
new
ZenMode
()
new
DueDateSelect
()
new
GLForm
(
$
(
'.milestone-form'
))
when
'groups:milestones:new'
new
ZenMode
()
...
...
app/assets/javascripts/due_date_select.js.coffee
View file @
9d09bd08
class
@
DueDateSelect
constructor
:
->
# Milestone edit/new form
$datePicker
=
$
(
'.datepicker'
)
$dueDate
=
$
(
'#milestone_due_date'
)
$datePicker
.
datepicker
dateFormat
:
'yy-mm-dd'
onSelect
:
(
dateText
,
inst
)
->
$dueDate
.
val
(
dateText
)
.
datepicker
(
'setDate'
,
$
.
datepicker
.
parseDate
(
'yy-mm-dd'
,
$dueDate
.
val
()))
$
(
'.js-clear-due-date'
).
on
'click'
,
(
e
)
->
e
.
preventDefault
()
$dueDate
.
val
(
''
)
$datePicker
.
datepicker
(
'setDate'
,
''
)
# Issuable sidebar
$loading
=
$
(
'.js-issuable-update .due_date'
)
.
find
(
'.block-loading'
)
.
hide
()
...
...
app/views/projects/milestones/_form.html.haml
View file @
9d09bd08
...
...
@@ -19,6 +19,7 @@
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:due_date
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
%a
.inline.prepend-top-5.js-clear-due-date
{
href:
"#"
}
Clear due date
.form-actions
-
if
@milestone
.
new_record?
...
...
@@ -27,10 +28,3 @@
-
else
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
=
link_to
"Cancel"
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
"btn btn-cancel"
:javascript
$
(
"
.datepicker
"
).
datepicker
({
dateFormat
:
"
yy-mm-dd
"
,
onSelect
:
function
(
dateText
,
inst
)
{
$
(
"
#milestone_due_date
"
).
val
(
dateText
)
}
}).
datepicker
(
"
setDate
"
,
$
.
datepicker
.
parseDate
(
'
yy-mm-dd
'
,
$
(
'
#milestone_due_date
'
).
val
()));
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