diff options
| author | Annabel Dunstone Gray <annabel@gitlab.com> | 2017-09-20 19:28:53 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel@gitlab.com> | 2017-09-20 19:28:53 +0000 |
| commit | d3ee059d44aa0d31fc50f5f738b4d4c6408c9ede (patch) | |
| tree | fc0b7888301659aba7f521a0bcc0961d5ca773c7 | |
| parent | 8612b0889482a184c366e0493ab8f17b6e324418 (diff) | |
| parent | 6f8d669da643f522137dd7b9bd79cc6b6ccbb93f (diff) | |
| download | gitlab-ce-d3ee059d44aa0d31fc50f5f738b4d4c6408c9ede.tar.gz | |
Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'
Fix the "resolve discussion in a new issue" button
Closes #38049
See merge request gitlab-org/gitlab-ce!14357
3 files changed, 17 insertions, 8 deletions
diff --git a/app/views/discussions/_new_issue_for_all_discussions.html.haml b/app/views/discussions/_new_issue_for_all_discussions.html.haml index cab346fb514..50dd5864195 100644 --- a/app/views/discussions/_new_issue_for_all_discussions.html.haml +++ b/app/views/discussions/_new_issue_for_all_discussions.html.haml @@ -1,6 +1,8 @@ - if merge_request.discussions_can_be_resolved_by?(current_user) && can?(current_user, :create_issue, @project) .btn-group{ role: "group", "v-if" => "unresolvedDiscussionCount > 0" } - .btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve all discussions in new issue", - "aria-label" => "Resolve all discussions in a new issue", - "data-container" => "body" } - = link_to custom_icon('icon_mr_issue'), new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid), title: "Resolve all discussions in new issue", class: 'new-issue-for-discussion' + = link_to custom_icon('icon_mr_issue'), + new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid), + title: 'Resolve all discussions in new issue', + aria: { label: 'Resolve all discussions in new issue' }, + data: { container: 'body' }, + class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml index a9bc317b8f8..2bfe118c608 100644 --- a/app/views/discussions/_new_issue_for_discussion.html.haml +++ b/app/views/discussions/_new_issue_for_discussion.html.haml @@ -2,7 +2,9 @@ %new-issue-for-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", "inline-template" => true } .btn-group{ role: "group", "v-if" => "showButton" } - .btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve this discussion in a new issue", - "aria-label" => "Resolve this discussion in a new issue", - "data-container" => "body" } - = 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", class: 'new-issue-for-discussion' + = 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' }, + data: { container: 'body' }, + class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/changelogs/unreleased/38049-fix-resolve-in-new-issue-btn.yml b/changelogs/unreleased/38049-fix-resolve-in-new-issue-btn.yml new file mode 100644 index 00000000000..a904c656f4f --- /dev/null +++ b/changelogs/unreleased/38049-fix-resolve-in-new-issue-btn.yml @@ -0,0 +1,5 @@ +--- +title: Fix the "resolve discussion in a new issue" button +merge_request: 14357 +author: +type: fixed |