2013-06-23 16:47:22 +00:00
|
|
|
= render "projects/commits/head"
|
2012-02-06 20:32:04 +00:00
|
|
|
|
2013-07-13 05:45:48 +00:00
|
|
|
%h3.page-title
|
2012-02-06 20:32:04 +00:00
|
|
|
Compare View
|
|
|
|
|
2012-09-26 03:13:19 +00:00
|
|
|
= render "form"
|
2012-02-06 20:32:04 +00:00
|
|
|
|
2012-09-21 08:22:53 +00:00
|
|
|
- if @commits.present?
|
2014-05-29 15:42:44 +00:00
|
|
|
%div.panel.panel-default
|
2014-05-29 15:43:21 +00:00
|
|
|
.panel-heading
|
2013-01-08 10:23:33 +00:00
|
|
|
Commits (#{@commits.count})
|
2014-02-05 13:54:51 +00:00
|
|
|
- if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
|
|
|
|
%ul.well-list
|
|
|
|
- Commit.decorate(@commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE)).each do |commit|
|
|
|
|
= render "projects/commits/inline_commit", commit: commit, project: @project
|
|
|
|
%li.warning-row.unstyled
|
|
|
|
other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
|
|
|
|
- else
|
|
|
|
%ul.well-list= render Commit.decorate(@commits), project: @project
|
2012-02-06 20:32:04 +00:00
|
|
|
|
2014-03-26 12:51:28 +00:00
|
|
|
%h4 Changes
|
2014-02-05 14:09:13 +00:00
|
|
|
- if @diffs.present?
|
2013-07-30 10:35:33 +00:00
|
|
|
= render "projects/commits/diffs", diffs: @diffs, project: @project
|
2014-02-05 14:09:13 +00:00
|
|
|
- elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
|
2014-02-05 14:21:41 +00:00
|
|
|
.bs-callout.bs-callout-danger
|
|
|
|
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
|
2014-03-26 12:51:28 +00:00
|
|
|
%p To preserve performance the line changes are not shown.
|
2014-02-05 14:21:41 +00:00
|
|
|
- elsif @timeout
|
|
|
|
.bs-callout.bs-callout-danger
|
2014-03-26 12:51:28 +00:00
|
|
|
%h4 Number of changed files for this comparison is extremely large.
|
|
|
|
%p Use command line to browse through changes for this comparison.
|
2014-02-05 14:21:41 +00:00
|
|
|
|
2014-02-05 14:09:13 +00:00
|
|
|
|
2013-09-12 17:15:10 +00:00
|
|
|
- else
|
|
|
|
.light-well
|
|
|
|
%center
|
|
|
|
%h4
|
|
|
|
There isn't anything to compare.
|
|
|
|
%p.slead
|
|
|
|
- if params[:to] == params[:from]
|
|
|
|
You'll need to use different branch names to get a valid comparison.
|
|
|
|
- else
|
|
|
|
%span.label-branch #{params[:from]}
|
|
|
|
and
|
|
|
|
%span.label-branch #{params[:to]}
|
|
|
|
are the same.
|