Skip to content
Snippets Groups Projects
Commit 65d4b1c1 authored by Oswaldo Ferreir's avatar Oswaldo Ferreir
Browse files

Enable to send a note in a expanded line

parent 89623dcc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -81,7 +81,6 @@ export default {
this.showCommentButton &&
this.isHover &&
!this.isMatchLine &&
!this.isContextLine &&
!this.isMetaLine &&
!this.hasDiscussions
);
Loading
Loading
Loading
Loading
@@ -91,7 +91,6 @@ export default {
this.isLoggedIn &&
this.isHover &&
!this.isMatchLine &&
!this.isContextLine &&
!this.isMetaLine,
};
},
Loading
Loading
Loading
Loading
@@ -48,7 +48,6 @@ export default {
},
classNameMap() {
return {
[CONTEXT_LINE_CLASS_NAME]: this.isContextLine,
[PARALLEL_DIFF_VIEW_TYPE]: true,
};
},
Loading
Loading
Loading
Loading
@@ -60,7 +60,14 @@ export default {
const { highlightedDiffLines, parallelDiffLines } = diffFile;
 
removeMatchLine(diffFile, lineNumbers, bottom);
const lines = addLineReferences(contextLines, lineNumbers, bottom);
const lines = addLineReferences(contextLines, lineNumbers, bottom)
.map(line => ({
...line,
lineCode: line.lineCode || `${fileHash}_${line.oldLine}_${line.newLine}`,
discussions: line.discussions || [],
}));
addContextLines({
inlineLines: highlightedDiffLines,
parallelLines: parallelDiffLines,
Loading
Loading
Loading
Loading
@@ -122,7 +122,7 @@ class Projects::BlobController < Projects::ApplicationController
@lines.map! do |line|
# These are marked as context lines but are loaded from blobs.
# We also have context lines loaded from diffs in other places.
diff_line = Gitlab::Diff::Line.new(line, 'context', nil, nil, nil)
diff_line = Gitlab::Diff::Line.new(line, nil, nil, nil, nil)
diff_line.rich_text = line
diff_line
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment