diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-04-11 22:46:43 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-11 22:46:43 +0000 |
commit | d25cdca68fb945db6b60cf4da60bc6ed503bea49 (patch) | |
tree | 42c22764e6775ef66449b7b6b47cfcea6acf932a | |
parent | 396379d8f03dd6fece0c2c3b2bc769249bd0aed9 (diff) | |
parent | 1f683902a6446b805e81bd5a1a7adc749f220ea6 (diff) | |
download | gitlab-ce-d25cdca68fb945db6b60cf4da60bc6ed503bea49.tar.gz |
Merge branch '10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js' into 'master'
Backport of "Move EE differences for `app/assets/javascripts/boards/models/milestone.js`"
See merge request gitlab-org/gitlab-ce!27272
-rw-r--r-- | app/assets/javascripts/boards/models/milestone.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/milestone.js b/app/assets/javascripts/boards/models/milestone.js index 17d15278a74..6f81d6bc6f8 100644 --- a/app/assets/javascripts/boards/models/milestone.js +++ b/app/assets/javascripts/boards/models/milestone.js @@ -1,7 +1,16 @@ -class ListMilestone { +import { isEE } from '~/lib/utils/common_utils'; + +export default class ListMilestone { constructor(obj) { this.id = obj.id; this.title = obj.title; + + if (isEE) { + this.path = obj.path; + this.state = obj.state; + this.webUrl = obj.web_url || obj.webUrl; + this.description = obj.description; + } } } |