summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/store/utils.js
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-12-07 09:06:14 +0000
committerMike Greiling <mike@pixelcog.com>2018-12-07 09:06:14 +0000
commit7c4e996c74394708f8f7ebe3b4c90da936c014c8 (patch)
tree1538cb423d684fa7a200f41e6ae97eb2adb68880 /app/assets/javascripts/diffs/store/utils.js
parenta2e06ad3034cd1e007b78514a5c1f47feef7b648 (diff)
parente7439c310471d024df04796c227988a152c4c072 (diff)
downloadgitlab-ce-7c4e996c74394708f8f7ebe3b4c90da936c014c8.tar.gz
Merge branch 'winh-merge-request-diff-discussion-commit-id' into 'master'
Pass commit when posting diff discussions See merge request gitlab-org/gitlab-ce!23371
Diffstat (limited to 'app/assets/javascripts/diffs/store/utils.js')
-rw-r--r--app/assets/javascripts/diffs/store/utils.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index 5c6b20109bb..cbaa0e26395 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -27,6 +27,7 @@ export const getReversePosition = linePosition => {
export function getFormData(params) {
const {
+ commit,
note,
noteableType,
noteableData,
@@ -66,7 +67,7 @@ export function getFormData(params) {
position,
noteable_type: noteableType,
noteable_id: noteableData.id,
- commit_id: '',
+ commit_id: commit && commit.id,
type:
diffFile.diff_refs.start_sha && diffFile.diff_refs.head_sha
? DIFF_NOTE_TYPE