diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2016-12-22 13:31:12 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | 0267b83898d604181e70c5ea8ac4a84108d2e6d6 (patch) | |
| tree | 3ce8cc81ba90185c976f3b19b7e548c67856370f /app/views/discussions | |
| parent | 9ed3db915026c6e0cd266a1c276386e3e96d2151 (diff) | |
| download | gitlab-ce-0267b83898d604181e70c5ea8ac4a84108d2e6d6.tar.gz | |
Delegate a single discussion to a new issue
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_new_issue_for_discussion.html.haml | 8 | ||||
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml new file mode 100644 index 00000000000..de28ded9820 --- /dev/null +++ b/app/views/discussions/_new_issue_for_discussion.html.haml @@ -0,0 +1,8 @@ +- if discussion.can_resolve?(current_user) && can?(current_user, :create_issue, @project) + %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_namespace_project_issue_path(@project.namespace, @project, discussion_to_resolve: discussion.id), title: "Resolve this discussion in a new issue", class: 'new-issue-for-discussion' diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index dfdbdf1f969..4a1e93cec3a 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -11,6 +11,8 @@ = link_to_reply_discussion(discussion, line_type) = render "discussions/resolve_all", discussion: discussion - if discussion.for_merge_request? - = render "discussions/jump_to_next", discussion: discussion + .btn-group.discussion-actions + = render "discussions/new_issue_for_discussion", discussion: discussion + = render "discussions/jump_to_next", discussion: discussion - else = link_to_reply_discussion(discussion) |