2012-06-20 17:21:13 -04:00
|
|
|
- if @commits.present?
|
2012-02-14 18:15:02 -05:00
|
|
|
.ui-box
|
2013-07-13 13:36:21 -04:00
|
|
|
.title
|
2012-07-16 01:03:10 -04:00
|
|
|
%i.icon-list
|
|
|
|
Commits (#{@commits.count})
|
2013-01-04 20:18:39 -05:00
|
|
|
.commits
|
2012-04-17 15:08:07 -04:00
|
|
|
- if @commits.count > 8
|
2013-01-04 20:18:39 -05:00
|
|
|
%ul.first-commits.well-list
|
2012-06-03 18:37:27 -04:00
|
|
|
- @commits.first(8).each do |commit|
|
2013-04-25 10:15:33 -04:00
|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
2012-06-03 18:37:27 -04:00
|
|
|
%li.bottom
|
2012-04-17 15:08:07 -04:00
|
|
|
8 of #{@commits.count} commits displayed.
|
2012-06-03 18:37:27 -04:00
|
|
|
%strong
|
2013-01-04 20:18:39 -05:00
|
|
|
%a.show-all-commits Click here to show all
|
|
|
|
%ul.all-commits.hide.well-list
|
2012-06-03 18:37:27 -04:00
|
|
|
- @commits.each do |commit|
|
2013-04-25 10:15:33 -04:00
|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
2012-04-17 15:08:07 -04:00
|
|
|
|
2012-06-03 18:37:27 -04:00
|
|
|
- else
|
2012-12-17 22:14:05 -05:00
|
|
|
%ul.well-list
|
2012-06-03 18:37:27 -04:00
|
|
|
- @commits.each do |commit|
|
2013-04-25 10:15:33 -04:00
|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
2011-11-28 15:16:57 -05:00
|
|
|
|
2012-06-03 18:37:27 -04:00
|
|
|
- else
|
2013-04-05 09:19:05 -04:00
|
|
|
%h4.nothing_here_message
|
2012-06-03 18:37:27 -04:00
|
|
|
Nothing to merge from
|
2013-04-05 09:19:05 -04:00
|
|
|
%span.label-branch #{@merge_request.source_branch}
|
2012-06-03 18:37:27 -04:00
|
|
|
to
|
2013-04-05 09:19:05 -04:00
|
|
|
%span.label-branch #{@merge_request.target_branch}
|
2012-02-14 18:15:02 -05:00
|
|
|
%br
|