diff options
| author | Kushal Pandya <kushal@gitlab.com> | 2018-04-05 13:56:54 +0530 |
|---|---|---|
| committer | Kushal Pandya <kushal@gitlab.com> | 2018-04-06 14:26:39 +0530 |
| commit | 223eeae1a774df4f8d7f132040ba10547184ec68 (patch) | |
| tree | 59e35b2eb238df23663f509f7a14cf694e5b6e6e | |
| parent | 15195f67840cd5369d776938b62b02aa939a4270 (diff) | |
| download | gitlab-ce-223eeae1a774df4f8d7f132040ba10547184ec68.tar.gz | |
Return noteableType from app initial config
| -rw-r--r-- | app/assets/javascripts/notes/components/notes_app.vue | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index 5bd81c7cad6..ebfc827ac57 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -49,16 +49,7 @@ export default { computed: { ...mapGetters(['notes', 'getNotesDataByProp', 'discussionCount']), noteableType() { - // FIXME -- @fatihacet Get this from JSON data. - const { ISSUE_NOTEABLE_TYPE, MERGE_REQUEST_NOTEABLE_TYPE, EPIC_NOTEABLE_TYPE } = constants; - - if (this.noteableData.noteableType === EPIC_NOTEABLE_TYPE) { - return EPIC_NOTEABLE_TYPE; - } - - return this.noteableData.merge_params - ? MERGE_REQUEST_NOTEABLE_TYPE - : ISSUE_NOTEABLE_TYPE; + return this.noteableData.noteableType; }, allNotes() { if (this.isLoading) { |