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
9f35f6d9
Commit
9f35f6d9
authored
Apr 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed commit files not opening correctly
parent
af507c79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+1
-1
app/assets/javascripts/ide/stores/mutations/file.js
app/assets/javascripts/ide/stores/mutations/file.js
+4
-0
No files found.
app/assets/javascripts/ide/stores/actions/file.js
View file @
9f35f6d9
...
@@ -193,7 +193,7 @@ export const unstageChange = ({ commit }, path) => {
...
@@ -193,7 +193,7 @@ export const unstageChange = ({ commit }, path) => {
};
};
export
const
openPendingTab
=
({
commit
,
getters
,
dispatch
,
state
},
{
file
,
keyPrefix
})
=>
{
export
const
openPendingTab
=
({
commit
,
getters
,
dispatch
,
state
},
{
file
,
keyPrefix
})
=>
{
if
(
getters
.
activeFile
&&
getters
.
activeFile
===
file
&&
state
.
viewer
===
'
diff
'
)
{
if
(
getters
.
activeFile
&&
getters
.
activeFile
.
path
===
file
.
path
&&
state
.
viewer
===
'
diff
'
)
{
return
false
;
return
false
;
}
}
...
...
app/assets/javascripts/ide/stores/mutations/file.js
View file @
9f35f6d9
...
@@ -192,6 +192,10 @@ export default {
...
@@ -192,6 +192,10 @@ export default {
return
acc
.
concat
(
f
);
return
acc
.
concat
(
f
);
},
[]);
},
[]);
}
else
{
openFiles
=
state
.
openFiles
.
map
(
f
=>
Object
.
assign
(
f
,
{
active
:
f
.
key
===
key
,
opened
:
f
.
key
===
key
}),
);
}
}
Object
.
assign
(
state
,
{
openFiles
});
Object
.
assign
(
state
,
{
openFiles
});
...
...
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