diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-02-27 16:01:56 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | d6453e75b7100ee94c3d125d21627961adcaa8cc (patch) | |
| tree | 08e0f7f1604d156b5fdfcf059f16317137784c74 /app/views | |
| parent | f86928953d2d79f40f10813a6e244c1da0779d16 (diff) | |
| download | gitlab-ce-d6453e75b7100ee94c3d125d21627961adcaa8cc.tar.gz | |
Add a button to delegate all discussions in a merge request
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/discussions/_new_issue_for_all_discussions.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 1 |
2 files changed, 7 insertions, 0 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 new file mode 100644 index 00000000000..21fbbbee54b --- /dev/null +++ b/app/views/discussions/_new_issue_for_all_discussions.html.haml @@ -0,0 +1,6 @@ +- 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 new issue", + "data-container" => "body" } + = link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_for_resolving_discussions: merge_request.iid), title: "Resolve all discussions in new issue", class: 'new-issue-for-discussion' diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 17be0490a86..524cec5e1f9 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -83,6 +83,7 @@ %span.line-resolve-text {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved = render "discussions/jump_to_next" + = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request .tab-content#diff-notes-app #notes.notes.tab-pane.voting_notes |