diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-11 10:48:01 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-11 10:48:01 +0300 |
| commit | 7e3bb679a92156304972e2db1ae49c9b0e4cd188 (patch) | |
| tree | 773700b881e5f161c5a888a1f9ff7c01aa94cefa /app/assets | |
| parent | fc7d76ae58cfd314867d69f2eaabb8ced31009b4 (diff) | |
| parent | 84475288ff666714d438dd9b1062d37bfe581333 (diff) | |
Merge branch 'ide-markdown-temp-file-fix' into 'master'
Fixed markdown preview in IDE not working for new files
See merge request gitlab-org/gitlab-ce!18287
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_editor.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index 6aa44ca2c11..711bafa17a9 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -22,7 +22,7 @@ export default { ...mapState(['rightPanelCollapsed', 'viewer', 'delayViewerUpdated', 'panelResizing']), ...mapGetters(['currentMergeRequest']), shouldHideEditor() { - return this.file && this.file.binary && !this.file.raw; + return this.file && this.file.binary && !this.file.content; }, editTabCSS() { return { @@ -212,7 +212,7 @@ export default { <content-viewer v-if="shouldHideEditor || file.viewMode === 'preview'" :content="file.content || file.raw" - :path="file.rawPath" + :path="file.rawPath || file.path" :file-size="file.size" :project-path="file.projectId"/> </div> |