Merge branch 'issue/55953' into 'master'

rename `discussion` to `thread`

Closes #55953

See merge request gitlab-org/gitlab-ce!29553

14 files changed, 33 insertions, 35 deletions

diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
index f66e07ba31a..7817b41514d 100644
--- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
+++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
@@ -32,15 +32,15 @@ const CommentAndResolveBtn = Vue.extend({
     buttonText: function() {
       if (this.isDiscussionResolved) {
         if (this.textareaIsEmpty) {
-          return __('Unresolve discussion');
+          return __('Unresolve thread');
         } else {
-          return __('Comment & unresolve discussion');
+          return __('Comment & unresolve thread');
         }
       } else {
         if (this.textareaIsEmpty) {
-          return __('Resolve discussion');
+          return __('Resolve thread');
         } else {
-          return __('Comment & resolve discussion');
+          return __('Comment & resolve thread');
         }
       }
     },
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 075c28e8d07..5a4b5f9398b 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -65,7 +65,7 @@ export default {
       return this.getUserData.id;
     },
     commentButtonTitle() {
-      return this.noteType === constants.COMMENT ? 'Comment' : 'Start discussion';
+      return this.noteType === constants.COMMENT ? 'Comment' : 'Start thread';
     },
     startDiscussionDescription() {
       let text = 'Discuss a specific suggestion or question';
@@ -418,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
                     >
                       <i aria-hidden="true" class="fa fa-check icon"> </i>
                       <div class="description">
-                        <strong>Start discussion</strong>
+                        <strong>Start thread</strong>
                         <p>{{ startDiscussionDescription }}</p>
                       </div>
                     </button>
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index efd84f5722c..d7ffa0abb79 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -61,7 +61,7 @@ export default {
         </span>
         <span class="line-resolve-text">
           {{ resolvedDiscussionsCount }}/{{ resolvableDiscussionsCount }}
-          {{ n__('discussion resolved', 'discussions resolved', resolvableDiscussionsCount) }}
+          {{ n__('thread resolved', 'threads resolved', resolvableDiscussionsCount) }}
         </span>
       </div>
       <div
@@ -72,7 +72,7 @@ export default {
         <a
           v-gl-tooltip
           :href="resolveAllDiscussionsIssuePath"
-          :title="s__('Resolve all discussions in new issue')"
+          :title="s__('Resolve all threads in new issue')"
           class="new-issue-for-discussion btn btn-default discussion-create-issue-btn"
         >
           <icon name="issue-new" />
@@ -81,7 +81,7 @@ export default {
       <div v-if="isLoggedIn && !allResolved" class="btn-group btn-group-sm" role="group">
         <button
           v-gl-tooltip
-          title="Jump to first unresolved discussion"
+          title="Jump to first unresolved thread"
           class="btn btn-default discussion-next-btn"
           @click="jumpToFirstUnresolvedDiscussion"
         >
diff --git a/app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue b/app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
index e413398696a..f03e6fd73d7 100644
--- a/app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
+++ b/app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
@@ -25,7 +25,7 @@ export default {
     <gl-button
       v-gl-tooltip
       :href="url"
-      :title="s__('MergeRequests|Resolve this discussion in a new issue')"
+      :title="s__('MergeRequests|Resolve this thread in a new issue')"
       class="new-issue-for-discussion discussion-create-issue-btn"
     >
       <icon name="issue-new" />
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 042ed196933..01be4f2b094 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -283,11 +283,11 @@ export default {
                   type="checkbox"
                   class="qa-unresolve-review-discussion"
                 />
-                {{ __('Unresolve discussion') }}
+                {{ __('Unresolve thread') }}
               </template>
               <template v-else>
                 <input v-model="isResolving" type="checkbox" class="qa-resolve-review-discussion" />
-                {{ __('Resolve discussion') }}
+                {{ __('Resolve thread') }}
               </template>
             </label>
           </p>
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index fbf82fab9e9..6466ab3acbe 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -70,7 +70,7 @@ export default {
         @click="handleToggle"
       >
         <i :class="toggleChevronClass" class="fa" aria-hidden="true"></i>
-        {{ __('Toggle discussion') }}
+        {{ __('Toggle thread') }}
       </button>
     </div>
     <a
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index f6b5fffde29..a71a89cfffc 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -174,22 +174,20 @@ export default {
         active: isActive,
       } = this.discussion;
 
-      let text = s__('MergeRequests|started a discussion');
+      let text = s__('MergeRequests|started a thread');
       if (isForCommit) {
-        text = s__(
-          'MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}',
-        );
+        text = s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}');
       } else if (isDiffDiscussion && commitId) {
         text = isActive
-          ? s__('MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}')
+          ? s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}')
           : s__(
-              'MergeRequests|started a discussion on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}',
+              'MergeRequests|started a thread 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 thread on %{linkStart}the diff%{linkEnd}')
           : s__(
-              'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}',
+              'MergeRequests|started a thread on %{linkStart}an old version of the diff%{linkEnd}',
             );
       }
 
diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js
index 2329727bca2..16b7598ee09 100644
--- a/app/assets/javascripts/notes/mixins/resolvable.js
+++ b/app/assets/javascripts/notes/mixins/resolvable.js
@@ -20,13 +20,13 @@ export default {
     resolveButtonTitle() {
       if (this.updatedNoteBody) {
         if (this.discussionResolved) {
-          return __('Comment & unresolve discussion');
+          return __('Comment & unresolve thread');
         }
 
-        return __('Comment & resolve discussion');
+        return __('Comment & resolve thread');
       }
 
-      return this.discussionResolved ? __('Unresolve discussion') : __('Resolve discussion');
+      return this.discussionResolved ? __('Unresolve thread') : __('Resolve thread');
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index a9fb40a4949..d4a5fdb4b97 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -20,7 +20,7 @@ export default {
     <status-icon :show-disabled-button="true" status="warning" />
     <div class="media-body space-children">
       <span class="bold">
-        {{ s__('mrWidget|There are unresolved discussions. Please resolve these discussions') }}
+        {{ s__('mrWidget|There are unresolved threads. Please resolve these threads') }}
       </span>
       <a
         v-if="mr.createIssueToResolveDiscussionsPath"
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 8f7cfe582ca..237ddbcf2c2 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -249,7 +249,7 @@ module SystemNoteService
   end
 
   def resolve_all_discussions(merge_request, project, author)
-    body = "resolved all discussions"
+    body = "resolved all threads"
 
     create_note(NoteSummary.new(merge_request, project, author, body, action: 'discussion'))
   end
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 10187129a33..9659d416a38 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -13,12 +13,12 @@
                 = icon("chevron-up")
               - else
                 = icon("chevron-down")
-              = _('Toggle discussion')
+              = _('Toggle thread')
           = link_to_member(@project, discussion.author, avatar: false)
 
           .inline.discussion-headline-light
             = discussion.author.to_reference
-            started a discussion
+            started a thread
 
             - url = discussion_path(discussion)
             - if discussion.for_commit? && @noteable != discussion.noteable
diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml
index 2bfe118c608..49d5378d62e 100644
--- a/app/views/discussions/_new_issue_for_discussion.html.haml
+++ b/app/views/discussions/_new_issue_for_discussion.html.haml
@@ -4,7 +4,7 @@
     .btn-group{ role: "group", "v-if" => "showButton" }
       = link_to custom_icon('icon_mr_issue'),
                 new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id),
-                title: 'Resolve this discussion in a new issue',
-                aria: { label: 'Resolve this discussion in a new issue' },
+                title: 'Resolve this thread in a new issue',
+                aria: { label: 'Resolve this thread in a new issue' },
                 data: { container: 'body' },
                 class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index c6a391ae563..1bd56e064d5 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -48,13 +48,13 @@
         = hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid
         - if @discussion_to_resolve
           = hidden_field_tag 'discussion_to_resolve', @discussion_to_resolve.id
-          Creating this issue will resolve the discussion in
+          Creating this issue will resolve the thread in
         - else
-          Creating this issue will resolve all discussions in
+          Creating this issue will resolve all threads in
         = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve)
       - else
         The
-        = @discussion_to_resolve ? 'discussion' : 'discussions'
+        = @discussion_to_resolve ? 'thread' : 'threads'
         at
         = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve)
         will stay unresolved. Ask someone with permission to resolve
diff --git a/app/views/shared/notes/_comment_button.html.haml b/app/views/shared/notes/_comment_button.html.haml
index c3f5eeb0da6..8d74eacc7dc 100644
--- a/app/views/shared/notes/_comment_button.html.haml
+++ b/app/views/shared/notes/_comment_button.html.haml
@@ -18,11 +18,11 @@
 
       %li.divider.droplab-item-ignore
 
-      %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start discussion'), 'close-text' => _("Start discussion & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start discussion & reopen %{noteable_name}") % { noteable_name: noteable_name } } }
+      %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start thread'), 'close-text' => _("Start thread & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start thread & reopen %{noteable_name}") % { noteable_name: noteable_name } } }
         %button.btn.btn-transparent
           = icon('check', class: 'icon')
           .description
-            %strong= _("Start discussion")
+            %strong= _("Start thread")
             %p
               = succeed '.' do
                 - if @note.noteable.supports_resolvable_notes?