diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-21 09:19:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-21 09:19:32 +0000 |
| commit | ea7b10cd57f5c4f1739725eff79c1d340ece7a15 (patch) | |
| tree | 92a3ada26ccd7cfc64cc4db1b95b4aa53b5b7c0f | |
| parent | 61c9edf63e0a121372b54b680ba0307f404f204a (diff) | |
| parent | 094e877efd8de154c76993b32e84640a541e21d0 (diff) | |
| download | gitlab-ce-ea7b10cd57f5c4f1739725eff79c1d340ece7a15.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/batch_comments/mixins/resolved_status.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/mark-comment-resolved.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index 20c31d9f8a4..96ee9f62ba4 100644 --- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -1,7 +1,7 @@ export default { computed: { resolveButtonTitle() { - let title = 'Mark as resolved'; + let title = 'Mark comment as resolved'; if (this.resolvedBy) { title = `Resolved by ${this.resolvedBy.name}`; diff --git a/changelogs/unreleased/mark-comment-resolved.yml b/changelogs/unreleased/mark-comment-resolved.yml new file mode 100644 index 00000000000..3343d18d16f --- /dev/null +++ b/changelogs/unreleased/mark-comment-resolved.yml @@ -0,0 +1,5 @@ +--- +title: Change resolve button text to mark comment as resolved +merge_request: +author: +type: fixed |