diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-10-30 13:58:34 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-10-30 13:58:34 +0000 |
commit | 391195f32b5aee5f5d4d4a10e8907696e2ecf617 (patch) | |
tree | bd7968308bb6d9cd7a5f1c20bfbc40739a7f48a2 /app | |
parent | 9a58468bee9a28d5762fb9f75e4d457552f943c8 (diff) | |
parent | e6b0f4420059285e1ad6e98d98321381ebd9d671 (diff) | |
download | gitlab-ce-391195f32b5aee5f5d4d4a10e8907696e2ecf617.tar.gz |
Merge branch '39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master'
Fix call stack size exceeded group milestone description autocomplete
Closes #39020
See merge request gitlab-org/gitlab-ce!14972
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 6 | ||||
-rw-r--r-- | app/views/groups/milestones/_form.html.haml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 970e83c0ecb..694767d6ac7 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -231,12 +231,16 @@ import Diff from './diff'; case 'projects:milestones:new': case 'projects:milestones:edit': case 'projects:milestones:update': + new ZenMode(); + new DueDateSelectors(); + new GLForm($('.milestone-form'), true); + break; case 'groups:milestones:new': case 'groups:milestones:edit': case 'groups:milestones:update': new ZenMode(); new DueDateSelectors(); - new GLForm($('.milestone-form'), true); + new GLForm($('.milestone-form'), false); break; case 'projects:compare:show': new Diff(); diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index cc879e5a308..a1be0d3220a 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -11,7 +11,7 @@ = f.label :description, "Description", class: "control-label" .col-sm-10 = render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do - = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...' + = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false .clearfix .error-alert |