Commit cb343c8b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

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

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

Closes #10016

See merge request gitlab-org/gitlab-ee!10694
parents ed5927ff 2c54e1fe
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
import Vue from 'vue'; import Vue from 'vue';
import '~/vue_shared/models/label'; import '~/vue_shared/models/label';
import { isEE } from '~/lib/utils/common_utils';
import IssueProject from './project'; import IssueProject from './project';
import boardsStore from '../stores/boards_store'; import boardsStore from '../stores/boards_store';
...@@ -90,13 +91,13 @@ class ListIssue { ...@@ -90,13 +91,13 @@ class ListIssue {
addMilestone(milestone) { addMilestone(milestone) {
const miletoneId = this.milestone ? this.milestone.id : null; const miletoneId = this.milestone ? this.milestone.id : null;
if (milestone.id !== miletoneId) { if (isEE && milestone.id !== miletoneId) {
this.milestone = new ListMilestone(milestone); this.milestone = new ListMilestone(milestone);
} }
} }
removeMilestone(removeMilestone) { removeMilestone(removeMilestone) {
if (removeMilestone && removeMilestone.id === this.milestone.id) { if (isEE && removeMilestone && removeMilestone.id === this.milestone.id) {
this.milestone = {}; this.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