diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
| commit | d9ef41cf4dd89716854ef27c4c6cbd93746e426a (patch) | |
| tree | 4832a35d5cb7fa34b6ba4fdd06ada89dd123b33b /app/views | |
| parent | e1198d4fe5cc24b6d3ca1368dd2300c9f4351cb5 (diff) | |
| parent | 1123057ab792ac73b1611f4d3a9faf79369dd6da (diff) | |
| download | gitlab-ce-d9ef41cf4dd89716854ef27c4c6cbd93746e426a.tar.gz | |
Merge branch '23589-open-issue-for-mr' into 'master'
Create an issue for all unresolved discussions in an MR
See merge request !7180
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml b/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml index 35d5677ee37..e094f97f3b6 100644 --- a/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml +++ b/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml @@ -3,4 +3,8 @@ This merge request has unresolved discussions %p - Please resolve these discussions to allow this merge request to be merged.
\ No newline at end of file + Please resolve these discussions + - if @project.issues_enabled? && can?(current_user, :create_issue, @project) + or + = link_to "open an issue to resolve them later", new_namespace_project_issue_path(@project.namespace, @project, merge_request_for_resolving_discussions: @merge_request.iid) + to allow this merge request to be merged. diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 2f05093f435..bdb00bfa33c 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -42,6 +42,21 @@ = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form +- if @merge_request_for_resolving_discussions + .form-group + .col-sm-10.col-sm-offset-2 + - if @merge_request_for_resolving_discussions.discussions_can_be_resolved_by?(current_user) + = icon('exclamation-triangle') + Creating this issue will mark all discussions in + = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions) + as resolved. + = hidden_field_tag 'merge_request_for_resolving_discussions', @merge_request_for_resolving_discussions.iid + - else + = icon('exclamation-triangle') + You can't automatically mark all discussions in + = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions) + as resolved. Ask someone with sufficient rights to resolve the them. + - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?) .row-content-block{class: (is_footer ? "footer-block" : "middle-block")} - if issuable.new_record? |