diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-27 12:17:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-27 12:17:34 +0000 |
| commit | 106cb511de8259bb57da65294b6e4fbba9146b80 (patch) | |
| tree | df461698c5f8ae92a569eec04b93cf8b91875f73 | |
| parent | 4146ce559e8858604ec91d663eac15f9e5379ff0 (diff) | |
| parent | 8c3c5afba2e5b15cc170d51b9aab16362ab7c595 (diff) | |
| download | gitlab-ce-106cb511de8259bb57da65294b6e4fbba9146b80.tar.gz | |
Merge branch 'support-file-attachments-milestones' into 'master'
Add file attachment support in Milestone description
### What does this MR do?
This MR adds support for attaching files to Milestone descriptions.
### Why was this MR needed?
Dropzone support should be in every Markdown area. It seems that this one was overlooked.
### What are the relevant issue numbers?
Closes #1648
See merge request !712
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index a62296e0656..82967cbe0b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 7.12.0 (unreleased) - Fix Markdown preview not working in Edit Milestone page (Stan Hu) - Fix Zen Mode not closing with ESC key (Stan Hu) - Allow HipChat API version to be blank and default to v2 (Stan Hu) + - Add file attachment support in Milestone description (Stan Hu) - Add web hook support for note events (Stan Hu) - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu) - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu) diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 2baaf430d98..da56e3cdbc8 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -27,6 +27,7 @@ class Dispatcher new Milestone() when 'projects:milestones:new', 'projects:milestones:edit' new ZenMode() + new DropzoneInput($('.milestone-form')) when 'projects:compare:show' new Diff() when 'projects:issues:new','projects:issues:edit' |