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

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}`;

changelogs/unreleased/mark-comment-resolved.yml

+---
+title: Change resolve button text to mark comment as resolved
+merge_request:
+author:
+type: fixed