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
Boxiang Sun
gitlab-ce
Commits
f8214f95
Commit
f8214f95
authored
Sep 03, 2018
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Left side comments
parent
173ecfc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/assets/javascripts/commons/vue.js
app/assets/javascripts/commons/vue.js
+0
-2
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+5
-1
No files found.
app/assets/javascripts/commons/vue.js
View file @
f8214f95
import
Vue
from
'
vue
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
Vue
.
config
.
performance
=
true
;
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
Vue
.
config
.
productionTip
=
false
;
}
app/assets/javascripts/diffs/store/actions.js
View file @
f8214f95
...
...
@@ -42,7 +42,11 @@ export const assignDiscussionsToDiff = ({ state }, allLineDiscussions) => {
);
if
(
targetLine
)
{
Object
.
assign
(
targetLine
.
right
,
{
discussions
});
if
(
targetLine
.
left
&&
targetLine
.
left
.
lineCode
===
discussions
[
0
].
line_code
)
{
Object
.
assign
(
targetLine
.
left
,
{
discussions
});
}
else
{
Object
.
assign
(
targetLine
.
right
,
{
discussions
});
}
}
const
targetInlineLine
=
selectedFile
.
highlightedDiffLines
.
find
(
...
...
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