kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '10011-boards' into 'master'

Browse source 
Add isEE check in milestone

See merge request gitlab-org/gitlab-ce!27814
This commit is contained in:
Kushal Pandya 2019-05-01 04:12:27 +00:00
commit acbfe10749
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/boards/boards_util.js Normal file
View file

@ -0,0 +1,7 @@
export function getMilestone() {
return null;
}
export default {
getMilestone,
};

4
app/assets/javascripts/boards/components/board_new_issue.vue
View file

@ -1,6 +1,7 @@
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { getMilestone } from 'ee_else_ce/boards/boards_util';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
import ProjectSelect from './project_select.vue'; import ProjectSelect from './project_select.vue';
import ListIssue from '../models/issue'; import ListIssue from '../models/issue';
@ -51,11 +52,14 @@ export default {
const labels = this.list.label ? [this.list.label] : []; const labels = this.list.label ? [this.list.label] : [];
const assignees = this.list.assignee ? [this.list.assignee] : []; const assignees = this.list.assignee ? [this.list.assignee] : [];
const milestone = getMilestone(this.list);
const issue = new ListIssue({ const issue = new ListIssue({
title: this.title, title: this.title,
labels, labels,
subscribed: true, subscribed: true,
assignees, assignees,
milestone,
project_id: this.selectedProject.id, project_id: this.selectedProject.id,
}); });