debian-mirror-gitlab/app/views/projects/merge_requests/show.html.haml

99 lines
5.3 KiB
Text
Raw Normal View History

2018-03-27 19:54:05 +05:30
- @gfm_form = true
2017-09-10 17:25:29 +05:30
- @content_class = "limit-container-width" unless fluid_layout
2018-03-17 18:26:18 +05:30
- add_to_breadcrumbs "Merge Requests", project_merge_requests_path(@project)
- breadcrumb_title @merge_request.to_reference
2017-09-10 17:25:29 +05:30
- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
- page_description @merge_request.description
- page_card_attributes @merge_request.card_attributes
2019-02-15 15:39:39 +05:30
- suggest_changes_help_path = help_page_path('user/discussions/index.md', anchor: 'suggest-changes')
2019-12-04 20:38:33 +05:30
- number_of_pipelines = @pipelines.size
2017-09-10 17:25:29 +05:30
2019-03-02 22:35:43 +05:30
.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 } }
2017-09-10 17:25:29 +05:30
= render "projects/merge_requests/mr_title"
.merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
= render "projects/merge_requests/mr_box"
- if @merge_request.source_branch_exists?
= render "projects/merge_requests/how_to_merge"
2019-10-12 21:52:04 +05:30
= javascript_tag nonce: true do
:plain
window.gl = window.gl || {};
window.gl.mrWidgetData = #{serialize_issuable(@merge_request, serializer: 'widget', issues_links: true)}
2017-09-10 17:25:29 +05:30
2019-10-12 21:52:04 +05:30
window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}';
window.gl.mrWidgetData.troubleshooting_docs_path = '#{help_page_path('user/project/merge_requests/index.md', anchor: 'troubleshooting')}';
2019-12-21 20:55:43 +05:30
window.gl.mrWidgetData.security_approvals_help_page_path = '#{help_page_path('user/application_security/index.html', anchor: 'security-approvals-in-merge-requests-ultimate')}';
2018-11-08 19:23:39 +05:30
2017-09-10 17:25:29 +05:30
#js-vue-mr-widget.mr-widget
2018-03-27 19:54:05 +05:30
.content-block.content-block-small.emoji-list-container.js-noteable-awards
2017-09-10 17:25:29 +05:30
= render 'award_emoji/awards_block', awardable: @merge_request, inline: true
.merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
.merge-request-tabs-container
2019-09-04 21:01:54 +05:30
%ul.merge-request-tabs.nav-tabs.nav.nav-links
2019-10-12 21:52:04 +05:30
%li.notes-tab{ data: { qa_selector: 'notes_tab'} }
2019-09-04 21:01:54 +05:30
= tab_link_for @merge_request, :show, force_link: @commit.present? do
= _("Discussion")
%span.badge.badge-pill= @merge_request.related_notes.user.count
- if @merge_request.source_project
%li.commits-tab
= tab_link_for @merge_request, :commits do
= _("Commits")
%span.badge.badge-pill= @commits_count
2019-12-04 20:38:33 +05:30
- if number_of_pipelines.nonzero?
2019-09-04 21:01:54 +05:30
%li.pipelines-tab
= tab_link_for @merge_request, :pipelines do
= _("Pipelines")
2019-12-04 20:38:33 +05:30
%span.badge.badge-pill.js-pipelines-mr-count= number_of_pipelines
2019-09-04 21:01:54 +05:30
%li.diffs-tab.qa-diffs-tab
= tab_link_for @merge_request, :diffs do
= _("Changes")
%span.badge.badge-pill= @merge_request.diff_size
.d-flex.flex-wrap.align-items-center.justify-content-lg-end
2018-12-13 13:39:08 +05:30
#js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@merge_request),
notes_filters: UserPreference.notes_filters.to_json } }
#js-vue-discussion-counter
2017-09-10 17:25:29 +05:30
.tab-content#diff-notes-app
2019-03-02 22:35:43 +05:30
#js-diff-file-finder
2017-09-10 17:25:29 +05:30
#notes.notes.tab-pane.voting_notes
.row
%section.col-md-12
2018-03-27 19:54:05 +05:30
%script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe
.issuable-discussion.js-vue-notes-event
2018-12-05 23:21:45 +05:30
#js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json,
2019-12-04 20:38:33 +05:30
noteable_data: serialize_issuable(@merge_request, serializer: 'noteable'),
2018-11-08 19:23:39 +05:30
noteable_type: 'MergeRequest',
target_type: 'merge_request',
2019-02-15 15:39:39 +05:30
help_page_path: suggest_changes_help_path,
2019-12-04 20:38:33 +05:30
current_user_data: @current_user_data} }
2017-09-10 17:25:29 +05:30
#commits.commits.tab-pane
-# This tab is always loaded via AJAX
#pipelines.pipelines.tab-pane
2019-12-04 20:38:33 +05:30
- if number_of_pipelines.nonzero?
2017-09-10 17:25:29 +05:30
= render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request)
2018-11-08 19:23:39 +05:30
#js-diffs-app.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked?,
endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json', request.query_parameters),
2019-02-15 15:39:39 +05:30
help_page_path: suggest_changes_help_path,
2019-12-04 20:38:33 +05:30
current_user_data: @current_user_data,
2019-02-15 15:39:39 +05:30
project_path: project_path(@merge_request.project),
2019-07-07 11:18:12 +05:30
changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
2019-09-04 21:01:54 +05:30
is_fluid_layout: fluid_layout.to_s,
dismiss_endpoint: user_callouts_path,
2019-12-04 20:38:33 +05:30
show_suggest_popover: show_suggest_popover?.to_s,
show_whitespace_default: @show_whitespace_default.to_s } }
2017-09-10 17:25:29 +05:30
.mr-loading-status
= spinner
2019-02-15 15:39:39 +05:30
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees
2017-09-10 17:25:29 +05:30
- 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