summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-25 21:41:47 -0700
committerStan Hu <stanhu@gmail.com>2015-05-25 21:41:47 -0700
commit8c3c5afba2e5b15cc170d51b9aab16362ab7c595 (patch)
treee24e2e7273328556667c309ec24b512857fa4970
parentdfa1d96a1fa372b292c83424f62ae10d2c053fbd (diff)
downloadgitlab-ce-8c3c5afba2e5b15cc170d51b9aab16362ab7c595.tar.gz
Add file attachment support in Milestone description
Closes #1648
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/javascripts/dispatcher.js.coffee1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ed9ffefb67f..168b54edc6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
+ - 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)
- Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
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'