diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index 8f875628a9f1ea7626da2fedd8e459f6b49bbade..5c008ebb3876a63f0450ed6d7884bdb90738bb4b 100644 --- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -39,9 +39,9 @@ export default { ? s__('MergeRequests|Thread stays resolved') : s__('MergeRequests|Thread will be resolved'); } else if (discussionResolved) { - message = s__('MergeRequests|Thread will be open'); + message = s__('MergeRequests|Reopen thread'); } else if (this.$options.showStaysResolved) { - message = s__('MergeRequests|Thread stays open'); + message = s__('MergeRequests|Resolve thread'); } return message; diff --git a/doc/user/project/merge_requests/reviews/_index.md b/doc/user/project/merge_requests/reviews/_index.md index 6330ca746730ecc41844adaef12b744b4ea021e8..cd44918bbc68544daf0952389120411f14c77757 100644 --- a/doc/user/project/merge_requests/reviews/_index.md +++ b/doc/user/project/merge_requests/reviews/_index.md @@ -185,7 +185,7 @@ Next, submit your review. ### Resolve or reopen thread with a comment -Review comments can also resolve or reopen comment threads. +Comments can also resolve or reopen comment threads. To resolve or reopen a thread when replying to a comment: 1. In the comment text area, write your comment. @@ -196,7 +196,7 @@ Pending comments display information about delayed actions. GitLab does not perf until you publish the comment: - {{< icon name="check-circle-filled" >}} Resolves thread. -- {{< icon name="check-circle" >}} Thread stays open. +- {{< icon name="check-circle" >}} Resolve thread. ## Submit a review diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a91cbc02d073486f04210390af96e44b5f7856f9..4991efe421ccebf219e0ad301220dd021315b558 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41154,22 +41154,22 @@ msgstr "" msgid "MergeRequests|Reference copied" msgstr "" -msgid "MergeRequests|Requires that merge checks pass." +msgid "MergeRequests|Reopen thread" msgstr "" -msgid "MergeRequests|Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch." +msgid "MergeRequests|Requires that merge checks pass." msgstr "" -msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." +msgid "MergeRequests|Resolve thread" msgstr "" -msgid "MergeRequests|Thread stays open" +msgid "MergeRequests|Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch." msgstr "" -msgid "MergeRequests|Thread stays resolved" +msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread will be open" +msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js index 140970c5714e3e9903581e55d1335ef39f04ab7e..873692e517c59b0be36d621cd9386969e8e8029e 100644 --- a/spec/frontend/notes/components/note_actions_spec.js +++ b/spec/frontend/notes/components/note_actions_spec.js @@ -353,7 +353,7 @@ describe('noteActions', () => { const resolveButton = wrapper.findComponent({ ref: 'resolveButton' }); expect(resolveButton.exists()).toBe(true); - expect(resolveButton.attributes('title')).toBe('Thread stays open'); + expect(resolveButton.attributes('title')).toBe('Resolve thread'); }); });