diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-01 04:12:27 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-01 04:12:27 +0000 |
commit | acbfe10749b130497a06b8d2430b86a8b459622e (patch) | |
tree | 2729e0a78ecb56d371a6187598168b5c7a9d7c1f | |
parent | 7bdfc77d1862e1419afdc95668c816a330e14a34 (diff) | |
parent | 147282cd0b69e1198db5801439383419b515ff53 (diff) | |
download | gitlab-ce-acbfe10749b130497a06b8d2430b86a8b459622e.tar.gz |
Merge branch '10011-boards' into 'master'
Add isEE check in milestone
See merge request gitlab-org/gitlab-ce!27814
-rw-r--r-- | app/assets/javascripts/boards/boards_util.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/board_new_issue.vue | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js new file mode 100644 index 00000000000..3178bda93b8 --- /dev/null +++ b/app/assets/javascripts/boards/boards_util.js @@ -0,0 +1,7 @@ +export function getMilestone() { + return null; +} + +export default { + getMilestone, +}; diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue index 70daba352f9..dc1bdc23b5e 100644 --- a/app/assets/javascripts/boards/components/board_new_issue.vue +++ b/app/assets/javascripts/boards/components/board_new_issue.vue @@ -1,6 +1,7 @@ <script> import $ from 'jquery'; import { GlButton } from '@gitlab/ui'; +import { getMilestone } from 'ee_else_ce/boards/boards_util'; import eventHub from '../eventhub'; import ProjectSelect from './project_select.vue'; import ListIssue from '../models/issue'; @@ -51,11 +52,14 @@ export default { const labels = this.list.label ? [this.list.label] : []; const assignees = this.list.assignee ? [this.list.assignee] : []; + const milestone = getMilestone(this.list); + const issue = new ListIssue({ title: this.title, labels, subscribed: true, assignees, + milestone, project_id: this.selectedProject.id, }); |