Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
988fde17
Commit
988fde17
authored
Apr 22, 2019
by
Natalia Tepluhina
Committed by
Clement Ho
Apr 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Created a hack to prevent setting content on image"
This reverts commit e8c1c930c3bc7c159463ed3bed8765db01b40328.
parent
fc77a89d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+1
-1
app/assets/javascripts/ide/stores/mutations.js
app/assets/javascripts/ide/stores/mutations.js
+2
-2
changelogs/unreleased/57293-fix-image-rename.yml
changelogs/unreleased/57293-fix-image-rename.yml
+5
-0
No files found.
app/assets/javascripts/ide/components/repo_editor.vue
View file @
988fde17
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
]),
]),
...
mapGetters
(
'
fileTemplates
'
,
[
'
showFileTemplatesBar
'
]),
...
mapGetters
(
'
fileTemplates
'
,
[
'
showFileTemplatesBar
'
]),
shouldHideEditor
()
{
shouldHideEditor
()
{
return
this
.
file
&&
this
.
file
.
binary
&&
!
this
.
file
.
content
;
return
this
.
file
&&
this
.
file
.
binary
;
},
},
showContentViewer
()
{
showContentViewer
()
{
return
(
return
(
...
...
app/assets/javascripts/ide/stores/mutations.js
View file @
988fde17
...
@@ -213,7 +213,7 @@ export default {
...
@@ -213,7 +213,7 @@ export default {
?
`
${
slashedParentPath
}${
oldEntry
.
name
}
`
?
`
${
slashedParentPath
}${
oldEntry
.
name
}
`
:
`
${
slashedParentPath
}${
name
}
`
;
:
`
${
slashedParentPath
}${
name
}
`
;
state
.
entries
[
newPath
]
=
{
Vue
.
set
(
state
.
entries
,
newPath
,
{
...
oldEntry
,
...
oldEntry
,
id
:
newPath
,
id
:
newPath
,
key
:
`
${
newPath
}
-
${
oldEntry
.
type
}
-
${
oldEntry
.
id
}
`
,
key
:
`
${
newPath
}
-
${
oldEntry
.
type
}
-
${
oldEntry
.
id
}
`
,
...
@@ -225,7 +225,7 @@ export default {
...
@@ -225,7 +225,7 @@ export default {
tree
:
[],
tree
:
[],
parentPath
,
parentPath
,
raw
:
''
,
raw
:
''
,
};
}
)
;
oldEntry
.
moved
=
true
;
oldEntry
.
moved
=
true
;
oldEntry
.
movedPath
=
newPath
;
oldEntry
.
movedPath
=
newPath
;
...
...
changelogs/unreleased/57293-fix-image-rename.yml
0 → 100644
View file @
988fde17
---
title
:
Resolve Renaming an image via Web IDE corrupts it
merge_request
:
27486
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment