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
0b3df0df
Commit
0b3df0df
authored
Feb 03, 2021
by
Phil Hughes
Committed by
Kushal Pandya
Feb 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed diff commit comments not appearing
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/227161
parent
9210aaf0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/javascripts/diffs/store/mutations.js
app/assets/javascripts/diffs/store/mutations.js
+6
-1
changelogs/unreleased/ph-227161-fixDiscussonsOnCommits.yml
changelogs/unreleased/ph-227161-fixDiscussonsOnCommits.yml
+5
-0
No files found.
app/assets/javascripts/diffs/store/mutations.js
View file @
0b3df0df
...
...
@@ -159,7 +159,12 @@ export default {
[
types
.
SET_LINE_DISCUSSIONS_FOR_FILE
](
state
,
{
discussion
,
diffPositionByLineCode
,
hash
})
{
const
{
latestDiff
}
=
state
;
const
discussionLineCodes
=
[
discussion
.
line_code
,
...(
discussion
.
line_codes
||
[])];
const
originalStartLineCode
=
discussion
.
original_position
?.
line_range
?.
start
?.
line_code
;
const
discussionLineCodes
=
[
discussion
.
line_code
,
originalStartLineCode
,
...(
discussion
.
line_codes
||
[]),
];
const
fileHash
=
discussion
.
diff_file
.
file_hash
;
const
lineCheck
=
(
line
)
=>
discussionLineCodes
.
some
(
...
...
changelogs/unreleased/ph-227161-fixDiscussonsOnCommits.yml
0 → 100644
View file @
0b3df0df
---
title
:
Fixed discussions on merge request commits not showing
merge_request
:
53143
author
:
type
:
fixed
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