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
c2b311e0
Commit
c2b311e0
authored
Apr 19, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed group milestones date pickers not working
Closes #31095
parent
bbd83376
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
3 deletions
+46
-3
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-3
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+3
-0
changelogs/unreleased/group-milestone-date-fields-fix.yml
changelogs/unreleased/group-milestone-date-fields-fix.yml
+4
-0
spec/features/groups/milestone_spec.rb
spec/features/groups/milestone_spec.rb
+36
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
c2b311e0
...
@@ -150,13 +150,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
...
@@ -150,13 +150,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
case
'
projects:milestones:new
'
:
case
'
projects:milestones:new
'
:
case
'
projects:milestones:edit
'
:
case
'
projects:milestones:edit
'
:
case
'
projects:milestones:update
'
:
case
'
projects:milestones:update
'
:
case
'
groups:milestones:new
'
:
case
'
groups:milestones:edit
'
:
case
'
groups:milestones:update
'
:
new
ZenMode
();
new
ZenMode
();
new
gl
.
DueDateSelectors
();
new
gl
.
DueDateSelectors
();
new
gl
.
GLForm
(
$
(
'
.milestone-form
'
));
new
gl
.
GLForm
(
$
(
'
.milestone-form
'
));
break
;
break
;
case
'
groups:milestones:new
'
:
new
ZenMode
();
break
;
case
'
projects:compare:show
'
:
case
'
projects:compare:show
'
:
new
gl
.
Diff
();
new
gl
.
Diff
();
break
;
break
;
...
...
app/assets/javascripts/dropzone_input.js
View file @
c2b311e0
...
@@ -38,6 +38,9 @@ window.DropzoneInput = (function() {
...
@@ -38,6 +38,9 @@ window.DropzoneInput = (function() {
"
opacity
"
:
0
,
"
opacity
"
:
0
,
"
display
"
:
"
none
"
"
display
"
:
"
none
"
});
});
if
(
!
project_uploads_path
)
return
;
dropzone
=
form_dropzone
.
dropzone
({
dropzone
=
form_dropzone
.
dropzone
({
url
:
project_uploads_path
,
url
:
project_uploads_path
,
dictDefaultMessage
:
""
,
dictDefaultMessage
:
""
,
...
...
changelogs/unreleased/group-milestone-date-fields-fix.yml
0 → 100644
View file @
c2b311e0
---
title
:
Fixed group milestone date dropdowns not opening
merge_request
:
author
:
spec/features/groups/milestone_spec.rb
0 → 100644
View file @
c2b311e0
require
'rails_helper'
feature
'Group milestones'
,
:feature
,
:js
do
let
(
:group
)
{
create
(
:group
)
}
let!
(
:project
)
{
create
(
:project_empty_repo
,
group:
group
)
}
let
(
:user
)
{
create
(
:group_member
,
:master
,
user:
create
(
:user
),
group:
group
).
user
}
before
do
Timecop
.
freeze
login_as
(
user
)
end
after
do
Timecop
.
return
end
context
'create a milestone'
do
before
do
visit
new_group_milestone_path
(
group
)
end
it
'creates milestone with start date'
do
fill_in
'Title'
,
with:
'testing'
find
(
'#milestone_start_date'
).
click
page
.
within
(
find
(
'.pika-single'
))
do
click_button
'1'
end
click_button
'Create milestone'
expect
(
find
(
'.start_date'
)).
to
have_content
(
Date
.
today
.
at_beginning_of_month
.
strftime
(
'%b %-d, %Y'
))
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