Merge branch 'mark-comment-resolved' into 'master'

Change resolve button text to mark comment as resolved Closes #61084 See merge request gitlab-org/gitlab-ce!28484

Merge branch 'mark-comment-resolved' into 'master'
Change resolve button text to mark comment as resolved Closes #61084 See merge request gitlab-org/gitlab-ce!28484
ea7b10cd · Filipa Lacerda · 61c9edf6 · 094e877e · ea7b10cd · ea7b10cd
--- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js
+++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
 export default {
  computed: {
    resolveButtonTitle() {
-      let title = 'Mark as resolved';
+      let title = 'Mark comment as resolved';

      if (this.resolvedBy) {
        title = `Resolved by ${this.resolvedBy.name}`;

--- a/changelogs/unreleased/mark-comment-resolved.yml
+++ b/changelogs/unreleased/mark-comment-resolved.yml
+---
+title: Change resolve button text to mark comment as resolved
+merge_request:
+author:
+type: fixed