Commit 3dfbc3c8 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js' into 'master'

Resolve "Move EE differences for `app/assets/javascripts/boards/models/list.js`"

Closes #10017

See merge request gitlab-org/gitlab-ee!10695
parents e3c4af9e 3ed4fb44
......@@ -4,7 +4,7 @@
import { __ } from '~/locale';
import ListLabel from '~/vue_shared/models/label';
import ListAssignee from '~/vue_shared/models/assignee';
import { urlParamsToObject } from '~/lib/utils/common_utils';
import { isEE, urlParamsToObject } from '~/lib/utils/common_utils';
import boardsStore from '../stores/boards_store';
import ListMilestone from './milestone';
......@@ -79,7 +79,7 @@ class List {
entityType = 'label_id';
} else if (this.assignee) {
entityType = 'assignee_id';
} else if (this.milestone) {
} else if (isEE && this.milestone) {
entityType = 'milestone_id';
}
......@@ -198,7 +198,7 @@ class List {
issue.addAssignee(this.assignee);
}
if (this.milestone) {
if (isEE && this.milestone) {
if (listFrom && listFrom.type === 'milestone') {
issue.removeMilestone(listFrom.milestone);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment