diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-19 10:04:24 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-19 10:04:24 +0100 |
| commit | c2b311e034eeec6d9a3ddab1a86a56e2c13a11d4 (patch) | |
| tree | d8e2c614419e6dc14d8e49b6084f0e540caec553 /app/assets | |
| parent | bbd83376d625b8d9cb73cbc83c3c0eb71b1abf32 (diff) | |
| download | gitlab-ce-c2b311e034eeec6d9a3ddab1a86a56e2c13a11d4.tar.gz | |
Fixed group milestones date pickers not workinggroup-milestone-date-fields-fix
Closes #31095
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/dropzone_input.js | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index d88b7cd0e17..31a9acebfe2 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -150,13 +150,13 @@ const ShortcutsBlob = require('./shortcuts_blob'); case 'projects:milestones:new': case 'projects:milestones:edit': case 'projects:milestones:update': + case 'groups:milestones:new': + case 'groups:milestones:edit': + case 'groups:milestones:update': new ZenMode(); new gl.DueDateSelectors(); new gl.GLForm($('.milestone-form')); break; - case 'groups:milestones:new': - new ZenMode(); - break; case 'projects:compare:show': new gl.Diff(); break; diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index df0e3f46827..5052fa1ecb0 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -38,6 +38,9 @@ window.DropzoneInput = (function() { "opacity": 0, "display": "none" }); + + if (!project_uploads_path) return; + dropzone = form_dropzone.dropzone({ url: project_uploads_path, dictDefaultMessage: "", |