diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-29 16:19:09 -0500 |
|---|---|---|
| committer | micael.bergeron <micaelbergeron@gmail.com> | 2017-12-07 09:01:19 -0500 |
| commit | e4eba908cd85c3ad7b9861c3edbd3c81623242a0 (patch) | |
| tree | 51704b1351f78fcd3de4a59399b10c5c3f64d70d /app/models/diff_discussion.rb | |
| parent | 17542a7895f288b8e7bc92836039f4dcbb7c17d2 (diff) | |
| download | gitlab-ce-e4eba908cd85c3ad7b9861c3edbd3c81623242a0.tar.gz | |
Allow commenting on individual commits inside an MR
Diffstat (limited to 'app/models/diff_discussion.rb')
| -rw-r--r-- | app/models/diff_discussion.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 6eba87da1a1..4a65738214b 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -24,7 +24,11 @@ class DiffDiscussion < Discussion return unless for_merge_request? return {} if active? - noteable.version_params_for(position.diff_refs) + if on_merge_request_commit? + { commit_id: commit_id } + else + noteable.version_params_for(position.diff_refs) + end end def reply_attributes |