diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-13 18:11:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-13 18:11:46 +0000 |
| commit | 02c9272b5433084ee48c55e5babd4cfd752dea20 (patch) | |
| tree | a5e3ede74d45f4ecf604740d14d9ad222dbbf4ab /app/assets/javascripts/notes | |
| parent | 85d19f5eac32e61cc0b69768523c15cc1e179389 (diff) | |
| download | gitlab-ce-02c9272b5433084ee48c55e5babd4cfd752dea20.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 55cf75132a9..d41c0a770d7 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -78,8 +78,8 @@ export default { v-if="resolveAllDiscussionsIssuePath && !allResolved" v-gl-tooltip :href="resolveAllDiscussionsIssuePath" - :title="s__('Resolve all threads in new issue')" - :aria-label="s__('Resolve all threads in new issue')" + :title="s__('Create issue to resolve all threads')" + :aria-label="s__('Create issue to resolve all threads')" class="new-issue-for-discussion discussion-create-issue-btn" icon="issue-new" /> 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 9119d319d72..4ccba011014 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 @@ -4,7 +4,7 @@ import { s__ } from '~/locale'; export default { i18n: { - buttonLabel: s__('MergeRequests|Resolve this thread in a new issue'), + buttonLabel: s__('MergeRequests|Create issue to resolve thread'), }, name: 'ResolveWithIssueButton', components: { |