Skip to content
代码片段 群组 项目
未验证 提交 aa821bef 编辑于 作者: Payton Burdette's avatar Payton Burdette 提交者: GitLab
浏览文件

Merge branch '22981-compare-branches-diffs' into 'master'

No related branches found
No related tags found
无相关合并请求
- @no_container = true
- container_class = fluid_layout ? '' : 'container-limited'
- add_to_breadcrumbs s_("CompareRevisions|Compare revisions"), project_compare_index_path(@project) - add_to_breadcrumbs s_("CompareRevisions|Compare revisions"), project_compare_index_path(@project)
- page_title "#{params[:from]} to #{params[:to]}" - page_title "#{params[:from]} to #{params[:to]}"
- has_diff = @commits.present? || @diffs.present? && @diffs.diff_files.present? - has_diff = @commits.present? || @diffs.present? && @diffs.diff_files.present?
-# Only show commit list in the first page -# Only show commit list in the first page
- hide_commit_list = params[:page].present? && params[:page] != '1' - hide_commit_list = params[:page].present? && params[:page] != '1'
.gl-border-b-0.gl-mb-0.gl-pt-4 .container-fluid{ class: [container_class] }
.js-signature-container{ data: { 'signatures-path' => signatures_namespace_project_compare_index_path } } .gl-border-b-0.gl-mb-0.gl-pt-4
#js-compare-selector{ data: project_compare_selector_data(@project, @merge_request, params) } .js-signature-container{ data: { 'signatures-path' => signatures_namespace_project_compare_index_path } }
#js-compare-selector{ data: project_compare_selector_data(@project, @merge_request, params) }
- if has_diff - if has_diff
= render "projects/commits/commit_list" unless hide_commit_list .container-fluid{ class: [container_class] }
= render "projects/diffs/diffs", = render "projects/commits/commit_list" unless hide_commit_list
diffs: @diffs, .container-fluid
environment: @environment, = render "projects/diffs/diffs",
diff_page_context: "is-compare", diffs: @diffs,
page: pagination_params[:page], environment: @environment,
paginate_diffs: true, diff_page_context: "is-compare",
paginate_diffs_per_page: Projects::CompareController::COMMIT_DIFFS_PER_PAGE page: pagination_params[:page],
paginate_diffs: true,
paginate_diffs_per_page: Projects::CompareController::COMMIT_DIFFS_PER_PAGE
- else - else
= render Pajamas::CardComponent.new(card_options: { class: "gl-bg-gray-10" }) do |c| .container-fluid
- c.with_body do = render Pajamas::CardComponent.new(card_options: { class: "gl-bg-gray-10" }) do |c|
= render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-commit-md.svg', - c.with_body do
title: s_("CompareRevisions|There isn't anything to compare")) do |c| = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-commit-md.svg',
title: s_("CompareRevisions|There isn't anything to compare")) do |c|
- c.with_description do - c.with_description do
- if params[:to] == params[:from] - if params[:to] == params[:from]
- source_branch = capture do - source_branch = capture do
%span.ref-name= params[:from] %span.ref-name= params[:from]
- target_branch = capture do - target_branch = capture do
%span.ref-name= params[:to] %span.ref-name= params[:to]
= (s_("CompareRevisions|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe = (s_("CompareRevisions|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe
- else - else
= _("To get a valid comparison, select two different branches.") = _("To get a valid comparison, select two different branches.")
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册