diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-01-19 15:31:04 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-01-19 15:31:04 +0100 |
| commit | 8171a1932b3c5e55ad3ea8402ac68ff14692ca32 (patch) | |
| tree | cdcef619d3df923e634bd61228179d80e88c61f6 /app/views/projects/merge_requests/show/_commits.html.haml | |
| parent | 8c9a4ed373f4b517aeae669e64023dc52c8d704a (diff) | |
| parent | 1cc6d206b5d4cf09bb502a254703f3a2de2dbeb7 (diff) | |
| download | gitlab-ce-8171a1932b3c5e55ad3ea8402ac68ff14692ca32.tar.gz | |
Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build
Diffstat (limited to 'app/views/projects/merge_requests/show/_commits.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_commits.html.haml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index a0e12fb3f38..11793919ff7 100644 --- a/app/views/projects/merge_requests/show/_commits.html.haml +++ b/app/views/projects/merge_requests/show/_commits.html.haml @@ -1,6 +1,8 @@ -.content-block.oneline-block - = icon("sort-amount-desc") - Most recent commits displayed first - -%ol#commits-list.list-unstyled - = render "projects/commits/commits", project: @merge_request.source_project, ref: @merge_request.source_branch +- if @commits.empty? + .commits-empty + %h4 + There are no commits yet. + = custom_icon ('illustration_no_commits') +- else + %ol#commits-list.list-unstyled + = render "projects/commits/commits", project: @merge_request.source_project, ref: @merge_request.source_branch |