Revert "Created a hack to prevent setting content on image"

This reverts commit e8c1c930c3bc7c159463ed3bed8765db01b40328.
This commit is contained in:
Natalia Tepluhina 2019-04-22 16:10:50 +00:00 committed by Clement Ho
parent fc77a89d58
commit 988fde17fd
3 changed files with 8 additions and 3 deletions

View file

@ -35,7 +35,7 @@ export default {
]),
...mapGetters('fileTemplates', ['showFileTemplatesBar']),
shouldHideEditor() {
return this.file && this.file.binary && !this.file.content;
return this.file && this.file.binary;
},
showContentViewer() {
return (

View file

@ -213,7 +213,7 @@ export default {
? `${slashedParentPath}${oldEntry.name}`
: `${slashedParentPath}${name}`;
state.entries[newPath] = {
Vue.set(state.entries, newPath, {
...oldEntry,
id: newPath,
key: `${newPath}-${oldEntry.type}-${oldEntry.id}`,
@ -225,7 +225,7 @@ export default {
tree: [],
parentPath,
raw: '',
};
});
oldEntry.moved = true;
oldEntry.movedPath = newPath;

View file

@ -0,0 +1,5 @@
---
title: Resolve Renaming an image via Web IDE corrupts it
merge_request: 27486
author:
type: fixed