diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-02 13:06:06 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-02 13:06:06 +0300 |
| commit | 0fd3fda8c65bfbe86f26a55843e77f98eeae23f5 (patch) | |
| tree | 041aa804508fc32f646660b8a1acb7c8151ec56a /app | |
| parent | 9b27d754a7f4c11a84954d1811da00458a295ed8 (diff) | |
| parent | 984f3b7dffc24636604e406b2240e2ae2e1b5f84 (diff) | |
Merge branch 'multi-file-editor-binary-editor' into 'master'
Fix binary files not showing anything in edit mode
See merge request gitlab-org/gitlab-ce!15124
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_editor.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue index 0d6729bb99b..1c864b176b1 100644 --- a/app/assets/javascripts/repo/components/repo_editor.vue +++ b/app/assets/javascripts/repo/components/repo_editor.vue @@ -27,6 +27,8 @@ export default { 'changeFileContent', ]), initMonaco() { + if (this.shouldHideEditor) return; + if (this.monacoInstance) { this.monacoInstance.setModel(null); } @@ -94,8 +96,12 @@ export default { <template> <div id="ide" - v-if='!shouldHideEditor' class="blob-viewer-container blob-editor-container" > + <div + v-if="shouldHideEditor" + v-html="activeFile.html" + > + </div> </div> </template> |