diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/_closed_by_box.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 36 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 5 |
3 files changed, 2 insertions, 43 deletions
diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml deleted file mode 100644 index 38469ed4774..00000000000 --- a/app/views/projects/issues/_closed_by_box.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.issue-closed-by-widget.second-block - - pluralized_mr_this = merge_request_count > 1 ? "these" : "this" - - pluralized_mr_is = merge_request_count > 1 ? "are" : "is" - When #{pluralized_mr_this} merge #{"request".pluralize(merge_request_count)} #{pluralized_mr_is} accepted, this issue will be closed automatically. diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml deleted file mode 100644 index 6a66c2e57cc..00000000000 --- a/app/views/projects/issues/_merge_requests.html.haml +++ /dev/null @@ -1,36 +0,0 @@ -- if @merge_requests.any? - .card-slim.mt-3 - .card-header - %h2.card-title.mt-0.mb-0.h5.merge-requests-title - %span.mr-1.bold - = _('Related merge requests') - .d-inline-flex.lh-100.align-middle - .mr-count-badge - .mr-count-badge-count - = sprite_icon('merge-request', size: 16, css_class: 'mr-1 text-secondary') - = @merge_requests.count - %ul.content-list.related-items-list - - has_any_head_pipeline = @merge_requests.any?(&:head_pipeline_id) - - @merge_requests.each do |merge_request| - - merge_request = merge_request.present(current_user: current_user) - %li.list-item.py-0.px-0 - .item-body.issuable-info-container.py-lg-3.px-lg-3.pl-md-3 - .item-contents - .item-title.d-flex.align-items-center.mr-title - = render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request, css_class: 'd-none d-xl-block append-right-8' } - = link_to merge_request.title, merge_request_path(merge_request), { class: 'mr-title-link'} - .item-meta - = render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request, css_class: 'd-xl-none d-lg-block append-right-5' } - %span.d-flex.align-items-center.append-right-8.mr-item-path.item-path-id.mt-0 - %span.path-id-text.bold.text-truncate{ data: { toggle: 'tooltip'}, title: merge_request.target_project.full_path } - = merge_request.target_project.full_path - = merge_request.to_reference - %span.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2 - - if merge_request.can_read_pipeline? - = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), tooltip_placement: 'bottom' - - elsif has_any_head_pipeline - = icon('blank fw') - - - if @closed_by_merge_requests.present? - %p - = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index f8969fbb5a2..2c95ac6dbb3 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -77,12 +77,11 @@ = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago') - #merge-requests{ data: { url: referenced_merge_requests_project_issue_path(@project, @issue) } } - // This element is filled in using JavaScript. + #js-related-merge-requests{ data: { endpoint: api_v4_projects_issues_related_merge_requests_path(id: @project.id, issue_iid: @issue.iid), project_namespace: @project.namespace.path, project_path: @project.path } } - if can?(current_user, :download_code, @project) #related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } } - // This element is filled in using JavaScript. + -# This element is filled in using JavaScript. .content-block.emoji-block.emoji-block-sticky .row |