Updated merge request commits view
The merge request commits tab now uses the same layout as used in the project commits view
This commit is contained in:
parent
a0c4fa3174
commit
b97b854963
|
@ -42,7 +42,7 @@
|
|||
%span.badge= @merge_request.mr_and_commit_notes.count
|
||||
%li.commits-tab{data: {action: 'commits'}}
|
||||
= link_to project_merge_request_path(@project, @merge_request), title: 'Commits' do
|
||||
%i.fa.fa-database
|
||||
%i.fa.fa-history
|
||||
Commits
|
||||
%span.badge= @commits.size
|
||||
%li.diffs-tab{data: {action: 'diffs'}}
|
||||
|
|
|
@ -1,30 +1 @@
|
|||
- if @commits.present?
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
%i.fa.fa-list
|
||||
Commits (#{@commits.count})
|
||||
.commits.mr-commits
|
||||
- if @commits.count > 8
|
||||
%ul.first-commits.well-list
|
||||
- @commits.first(8).each do |commit|
|
||||
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
||||
%li.bottom
|
||||
8 of #{@commits.count} commits displayed.
|
||||
%strong
|
||||
%a.show-all-commits Click here to show all
|
||||
- if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
|
||||
%ul.all-commits.hide.well-list
|
||||
- @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do |commit|
|
||||
= render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
|
||||
%li
|
||||
other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
|
||||
- else
|
||||
%ul.all-commits.hide.well-list
|
||||
- @commits.each do |commit|
|
||||
= render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
|
||||
|
||||
- else
|
||||
%ul.well-list
|
||||
- @commits.each do |commit|
|
||||
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
||||
|
||||
= render "projects/commits/commits"
|
Loading…
Reference in New Issue