Commit d3ee059d authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 8612b088 6f8d669d
- if merge_request.discussions_can_be_resolved_by?(current_user) && can?(current_user, :create_issue, @project) - 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-group{ role: "group", "v-if" => "unresolvedDiscussionCount > 0" }
.btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve all discussions in new issue", = link_to custom_icon('icon_mr_issue'),
"aria-label" => "Resolve all discussions in a new issue", new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid),
"data-container" => "body" } title: 'Resolve all discussions in new issue',
= 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' 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'
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
%new-issue-for-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", %new-issue-for-discussion-btn{ ":discussion-id" => "'#{discussion.id}'",
"inline-template" => true } "inline-template" => true }
.btn-group{ role: "group", "v-if" => "showButton" } .btn-group{ role: "group", "v-if" => "showButton" }
.btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve this discussion in a new issue", = link_to custom_icon('icon_mr_issue'),
"aria-label" => "Resolve this discussion in a new issue", new_project_issue_path(@project, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id),
"data-container" => "body" } title: 'Resolve this discussion in a new issue',
= 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' 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'
---
title: Fix the "resolve discussion in a new issue" button
merge_request: 14357
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment