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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
2aaa0222
Commit
2aaa0222
authored
Apr 05, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed delayed update viewer
fixed `key` not being set to correct value
parent
b61aa6f8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+1
-1
app/assets/javascripts/ide/stores/modules/commit/getters.js
app/assets/javascripts/ide/stores/modules/commit/getters.js
+3
-3
app/assets/javascripts/ide/stores/mutations/file.js
app/assets/javascripts/ide/stores/mutations/file.js
+1
-0
app/assets/javascripts/ide/stores/utils.js
app/assets/javascripts/ide/stores/utils.js
+1
-2
No files found.
app/assets/javascripts/ide/components/repo_editor.vue
View file @
2aaa0222
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
})
})
.
then
(()
=>
{
.
then
(()
=>
{
const
viewerPromise
=
this
.
delayViewerUpdated
const
viewerPromise
=
this
.
delayViewerUpdated
?
this
.
updateViewer
(
'
editor
'
)
?
this
.
updateViewer
(
this
.
file
.
pending
?
'
diff
'
:
'
editor
'
)
:
Promise
.
resolve
();
:
Promise
.
resolve
();
return
viewerPromise
;
return
viewerPromise
;
...
...
app/assets/javascripts/ide/stores/modules/commit/getters.js
View file @
2aaa0222
...
@@ -7,9 +7,9 @@ export const commitButtonDisabled = (state, getters, rootState) =>
...
@@ -7,9 +7,9 @@ export const commitButtonDisabled = (state, getters, rootState) =>
getters
.
discardDraftButtonDisabled
||
!
rootState
.
stagedFiles
.
length
;
getters
.
discardDraftButtonDisabled
||
!
rootState
.
stagedFiles
.
length
;
export
const
newBranchName
=
(
state
,
_
,
rootState
)
=>
export
const
newBranchName
=
(
state
,
_
,
rootState
)
=>
`
${
gon
.
current_username
}
-
${
`
${
gon
.
current_username
}
-
${
rootState
.
currentBranchId
}
-patch-
${
`
${
new
Date
().
getTime
()}
`
.
substr
(
rootState
.
currentBranchId
-
5
,
}
-patch-
${
`
${
new
Date
().
getTime
()}
`
.
substr
(
-
5
)}
`
;
)}
`
;
export
const
branchName
=
(
state
,
getters
,
rootState
)
=>
{
export
const
branchName
=
(
state
,
getters
,
rootState
)
=>
{
if
(
if
(
...
...
app/assets/javascripts/ide/stores/mutations/file.js
View file @
2aaa0222
...
@@ -131,6 +131,7 @@ export default {
...
@@ -131,6 +131,7 @@ export default {
if
(
!
changedFile
&&
stagedFile
)
{
if
(
!
changedFile
&&
stagedFile
)
{
Object
.
assign
(
state
.
entries
[
path
],
{
Object
.
assign
(
state
.
entries
[
path
],
{
...
stagedFile
,
...
stagedFile
,
key
:
state
.
entries
[
path
].
key
,
changed
:
true
,
changed
:
true
,
});
});
...
...
app/assets/javascripts/ide/stores/utils.js
View file @
2aaa0222
...
@@ -88,8 +88,7 @@ export const decorateData = entity => {
...
@@ -88,8 +88,7 @@ export const decorateData = entity => {
export
const
findEntry
=
(
tree
,
type
,
name
,
prop
=
'
name
'
)
=>
export
const
findEntry
=
(
tree
,
type
,
name
,
prop
=
'
name
'
)
=>
tree
.
find
(
f
=>
f
.
type
===
type
&&
f
[
prop
]
===
name
);
tree
.
find
(
f
=>
f
.
type
===
type
&&
f
[
prop
]
===
name
);
export
const
findIndexOfFile
=
(
state
,
file
)
=>
export
const
findIndexOfFile
=
(
state
,
file
)
=>
state
.
findIndex
(
f
=>
f
.
path
===
file
.
path
);
state
.
findIndex
(
f
=>
f
.
path
===
file
.
path
);
export
const
setPageTitle
=
title
=>
{
export
const
setPageTitle
=
title
=>
{
document
.
title
=
title
;
document
.
title
=
title
;
...
...
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