98 lines
5.9 KiB
Text
98 lines
5.9 KiB
Text
- @gfm_form = true
|
|
- @content_class = "limit-container-width" unless fluid_layout
|
|
- add_to_breadcrumbs "Merge Requests", project_merge_requests_path(@project)
|
|
- breadcrumb_title @merge_request.to_reference
|
|
- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
|
|
- page_description @merge_request.description
|
|
- page_card_attributes @merge_request.card_attributes
|
|
- suggest_changes_help_path = help_page_path('user/discussions/index.md', anchor: 'suggest-changes')
|
|
- number_of_pipelines = @pipelines.size
|
|
|
|
.merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version } }
|
|
= render "projects/merge_requests/mr_title"
|
|
|
|
.merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
|
|
= render "projects/merge_requests/mr_box"
|
|
|
|
- unless mr_tabs_position_enabled?
|
|
= render "projects/merge_requests/widget"
|
|
= render "projects/merge_requests/awards_block"
|
|
|
|
.merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
|
|
.merge-request-tabs-container
|
|
%ul.merge-request-tabs.nav-tabs.nav.nav-links
|
|
= render "projects/merge_requests/tabs/tab", class: "notes-tab", qa_selector: "notes_tab" do
|
|
= tab_link_for @merge_request, :show, force_link: @commit.present? do
|
|
- if mr_tabs_position_enabled?
|
|
= _("Overview")
|
|
- else
|
|
= _("Discussion")
|
|
%span.badge.badge-pill= @merge_request.related_notes.user.count
|
|
- if @merge_request.source_project
|
|
= render "projects/merge_requests/tabs/tab", name: "commits", class: "commits-tab" do
|
|
= tab_link_for @merge_request, :commits do
|
|
= _("Commits")
|
|
%span.badge.badge-pill= @commits_count
|
|
- if number_of_pipelines.nonzero?
|
|
= render "projects/merge_requests/tabs/tab", name: "pipelines", class: "pipelines-tab" do
|
|
= tab_link_for @merge_request, :pipelines do
|
|
= _("Pipelines")
|
|
%span.badge.badge-pill.js-pipelines-mr-count= number_of_pipelines
|
|
= render "projects/merge_requests/tabs/tab", name: "diffs", class: "diffs-tab qa-diffs-tab", id: "diffs-tab" do
|
|
= tab_link_for @merge_request, :diffs do
|
|
= _("Changes")
|
|
%span.badge.badge-pill= @merge_request.diff_size
|
|
- if mr_tabs_position_enabled? && show_tabs_feature_highlight?
|
|
.js-tabs-feature-highlight{ data: { dismiss_endpoint: user_callouts_path, feature_id: UserCalloutsHelper::TABS_POSITION_HIGHLIGHT } }
|
|
.d-flex.flex-wrap.align-items-center.justify-content-lg-end
|
|
- unless mr_tabs_position_enabled?
|
|
= render "projects/merge_requests/discussion_filter"
|
|
#js-vue-discussion-counter
|
|
|
|
.tab-content#diff-notes-app
|
|
#js-diff-file-finder
|
|
= render "projects/merge_requests/tabs/pane", id: "notes", class: "notes voting_notes" do
|
|
.row
|
|
%section.col-md-12
|
|
%script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe
|
|
.issuable-discussion.js-vue-notes-event
|
|
- if mr_tabs_position_enabled?
|
|
- if @merge_request.description.present?
|
|
.detail-page-description
|
|
= render "projects/merge_requests/description"
|
|
= render "projects/merge_requests/widget"
|
|
= render "projects/merge_requests/awards_block"
|
|
#js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json,
|
|
noteable_data: serialize_issuable(@merge_request, serializer: 'noteable'),
|
|
noteable_type: 'MergeRequest',
|
|
target_type: 'merge_request',
|
|
help_page_path: suggest_changes_help_path,
|
|
current_user_data: @current_user_data} }
|
|
|
|
= render "projects/merge_requests/tabs/pane", name: "commits", id: "commits", class: "commits" do
|
|
-# This tab is always loaded via AJAX
|
|
= render "projects/merge_requests/tabs/pane", name: "pipelines", id: "pipelines", class: "pipelines" do
|
|
- if number_of_pipelines.nonzero?
|
|
= render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request)
|
|
= render "projects/merge_requests/tabs/pane", name: "diffs", id: "js-diffs-app", class: "diffs", data: { "is-locked": @merge_request.discussion_locked?,
|
|
endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json', request.query_parameters),
|
|
endpoint_metadata: diffs_metadata_project_json_merge_request_path(@project, @merge_request, 'json', request.query_parameters),
|
|
endpoint_batch: diffs_batch_project_json_merge_request_path(@project, @merge_request, 'json', request.query_parameters),
|
|
help_page_path: suggest_changes_help_path,
|
|
current_user_data: @current_user_data,
|
|
project_path: project_path(@merge_request.project),
|
|
changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
|
|
is_fluid_layout: fluid_layout.to_s,
|
|
dismiss_endpoint: user_callouts_path,
|
|
show_suggest_popover: show_suggest_popover?.to_s,
|
|
show_whitespace_default: @show_whitespace_default.to_s }
|
|
|
|
.mr-loading-status
|
|
= spinner
|
|
|
|
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees
|
|
|
|
- if @merge_request.can_be_reverted?(current_user)
|
|
= render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title
|
|
- if @merge_request.can_be_cherry_picked?
|
|
= render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title
|