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
f1542fb7
Commit
f1542fb7
authored
Oct 28, 2020
by
Denys Mishunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Addressing the reviewer's comments
parent
2f4e80d2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
...avascripts/merge_conflicts/components/diff_file_editor.js
+3
-4
No files found.
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
View file @
f1542fb7
...
...
@@ -60,8 +60,7 @@ import { __ } from '~/locale';
const
DataPromise
=
axios
.
get
(
this
.
file
.
content_path
);
Promise
.
all
([
EditorPromise
,
DataPromise
])
.
then
(([{
default
:
EditorLite
},
{
data
}])
=>
{
const
{
content
,
new_path
:
path
}
=
data
;
.
then
(([{
default
:
EditorLite
},
{
data
:
{
content
,
new_path
:
path
}
}])
=>
{
const
contentEl
=
this
.
$el
.
querySelector
(
'
.editor
'
);
this
.
originalContent
=
content
;
...
...
@@ -69,8 +68,8 @@ import { __ } from '~/locale';
this
.
editor
=
new
EditorLite
().
createInstance
({
el
:
contentEl
,
blobPath
:
path
||
''
,
blobContent
:
content
||
''
,
blobPath
:
path
,
blobContent
:
content
,
});
this
.
editor
.
onDidChangeModelContent
(
debounce
(
this
.
saveDiffResolution
.
bind
(
this
),
250
));
})
...
...
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