diff options
-rw-r--r-- | app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue | 2 | ||||
-rw-r--r-- | app/views/discussions/_new_issue_for_discussion.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
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 e413398696a..f03e6fd73d7 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 @@ -25,7 +25,7 @@ export default { <gl-button v-gl-tooltip :href="url" - :title="s__('MergeRequests|Resolve this discussion in a new issue')" + :title="s__('MergeRequests|Resolve this thread in a new issue')" class="new-issue-for-discussion discussion-create-issue-btn" > <icon name="issue-new" /> diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml index 2bfe118c608..49d5378d62e 100644 --- a/app/views/discussions/_new_issue_for_discussion.html.haml +++ b/app/views/discussions/_new_issue_for_discussion.html.haml @@ -4,7 +4,7 @@ .btn-group{ role: "group", "v-if" => "showButton" } = link_to custom_icon('icon_mr_issue'), new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id), - title: 'Resolve this discussion in a new issue', - aria: { label: 'Resolve this discussion in a new issue' }, + title: 'Resolve this thread in a new issue', + aria: { label: 'Resolve this thread in a new issue' }, data: { container: 'body' }, class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' |