diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-23 11:40:57 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-23 11:45:45 +0200 |
| commit | 127836dd541ce0ecd4976d002d97b3e9e57f4947 (patch) | |
| tree | 2b45f554466aca0419ed3bf069abb7bb62c8e4b7 /app/views | |
| parent | 0e73d7b6af77e2191da2c8fea7232bc8d4a4bbe4 (diff) | |
| download | gitlab-ce-127836dd541ce0ecd4976d002d97b3e9e57f4947.tar.gz | |
Fix small CI UI regressions
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/ci/lints/_create.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml index f45cd05aec0..809fc52dbdf 100644 --- a/app/views/ci/lints/_create.html.haml +++ b/app/views/ci/lints/_create.html.haml @@ -17,7 +17,7 @@ %td #{stage.capitalize} Job - #{build[:name]} %td %pre - = simple_format build[:script] + = simple_format build[:commands] %br %b Tag list: @@ -28,6 +28,11 @@ %br %b Refs except: = build[:except] && build[:except].join(", ") + %br + %b When: + = build[:when] + - if build[:allow_failure] + %b Allowed to fail -else %p diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 3a8172dc8e6..e3d8d734913 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -155,7 +155,7 @@ - if @builds.present? .build-widget - %h4.title #{pluralize(@builds.count, "other build")} for #{@build.short_sha}: + %h4.title #{pluralize(@builds.count(:id), "other build")} for #{@build.short_sha}: %table.table.builds - @builds.each_with_index do |build, i| %tr.build |