diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-12-21 00:19:44 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-21 00:19:44 +0100 |
commit | 583859806262ca78557893853f9c619c917b14ee (patch) | |
tree | 5119ffc17b96770c16bb8a8544b648b3c59e2a80 /app/assets | |
parent | 37c934e089508e053e6ad4cf075b00cfaab53f3c (diff) | |
download | gitlab-ce-583859806262ca78557893853f9c619c917b14ee.tar.gz |
MR commits display commit ID for discussions
Fixes a bug where merge request comments made
in the context of a specific commit no longer specify
which commit they were created on
Diffstat (limited to 'app/assets')
-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 d9dd08a7a6b..7c3f5d00308 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) { |