Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/notes/components/diff_discussion_header.vue')
-rw-r--r--app/assets/javascripts/notes/components/diff_discussion_header.vue6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/diff_discussion_header.vue b/app/assets/javascripts/notes/components/diff_discussion_header.vue
index f949142d90a..c53d3203327 100644
--- a/app/assets/javascripts/notes/components/diff_discussion_header.vue
+++ b/app/assets/javascripts/notes/components/diff_discussion_header.vue
@@ -5,6 +5,7 @@ import { mapActions } from 'vuex';
import SafeHtml from '~/vue_shared/directives/safe_html';
import { truncateSha } from '~/lib/utils/text_utility';
import { s__, __, sprintf } from '~/locale';
+import { FILE_DIFF_POSITION_TYPE } from '~/diffs/constants';
import NoteEditedText from './note_edited_text.vue';
import NoteHeader from './note_header.vue';
@@ -62,6 +63,7 @@ export default {
for_commit: isForCommit,
diff_discussion: isDiffDiscussion,
active: isActive,
+ position,
} = this.discussion;
let text = s__('MergeRequests|started a thread');
@@ -75,6 +77,10 @@ export default {
: s__(
'MergeRequests|started a thread on an outdated change in commit %{linkStart}%{commitDisplay}%{linkEnd}',
);
+ } else if (isDiffDiscussion && position?.position_type === FILE_DIFF_POSITION_TYPE) {
+ text = isActive
+ ? s__('MergeRequests|started a thread on %{linkStart}a file%{linkEnd}')
+ : s__('MergeRequests|started a thread on %{linkStart}an old version of a file%{linkEnd}');
} else if (isDiffDiscussion) {
text = isActive
? s__('MergeRequests|started a thread on %{linkStart}the diff%{linkEnd}')