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/concerns | |
| parent | 17542a7895f288b8e7bc92836039f4dcbb7c17d2 (diff) | |
| download | gitlab-ce-e4eba908cd85c3ad7b9861c3edbd3c81623242a0.tar.gz | |
Allow commenting on individual commits inside an MR
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/discussion_on_diff.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb index f5cbb3becad..4b4d519f3df 100644 --- a/app/models/concerns/discussion_on_diff.rb +++ b/app/models/concerns/discussion_on_diff.rb @@ -32,6 +32,10 @@ module DiscussionOnDiff first_note.position.new_path end + def on_merge_request_commit? + for_merge_request? && commit_id.present? + end + # Returns an array of at most 16 highlighted lines above a diff note def truncated_diff_lines(highlight: true) lines = highlight ? highlighted_diff_lines : diff_lines |