diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-21 05:28:57 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-21 05:28:57 +0000 |
| commit | 80ff142c1cb8b11e6e1eda27dfc09cf0253e824b (patch) | |
| tree | 864a957247abecef5f5ef91566dac1751770ce20 /app | |
| parent | 5a3bff5d83d14aeaa590304d6b13d1a8320645c1 (diff) | |
| parent | 583859806262ca78557893853f9c619c917b14ee (diff) | |
| download | gitlab-ce-80ff142c1cb8b11e6e1eda27dfc09cf0253e824b.tar.gz | |
Merge branch 'winh-merge-request-commit-context' into 'master'
Display commit ID for discussions made on merge request commits
Closes #53953
See merge request gitlab-org/gitlab-ce!23837
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index bba215852b7..be451401e97 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -178,31 +178,32 @@ export default { commitId = `<span class="commit-sha">${truncateSha(commitId)}</span>`; } - let text = s__('MergeRequests|started a discussion'); + const { + for_commit: isForCommit, + diff_discussion: isDiffDiscussion, + active: isActive, + } = this.discussion; - if (this.discussion.for_commit) { + let text = s__('MergeRequests|started a discussion'); + if (isForCommit) { text = s__( 'MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}', ); - } else if (this.discussion.diff_discussion) { - if (this.discussion.active) { - text = s__('MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}'); - } else { - text = s__( - 'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}', - ); - } + } else if (isDiffDiscussion && commitId) { + text = isActive + ? s__('MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}') + : s__( + 'MergeRequests|started a discussion on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}', + ); + } else if (isDiffDiscussion) { + text = isActive + ? s__('MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}') + : s__( + 'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}', + ); } - return sprintf( - text, - { - commitId, - linkStart, - linkEnd, - }, - false, - ); + return sprintf(text, { commitId, linkStart, linkEnd }, false); }, diffLine() { if (this.discussion.diff_discussion && this.discussion.truncated_diff_lines) { |