summaryrefslogtreecommitdiff
path: root/app/views/projects/jobs
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-14 11:22:12 +0100
committerPhil Hughes <me@iamphill.com>2017-07-14 11:22:12 +0100
commitb85d69d1f0b379b2b055eca9695f8055b00e77b5 (patch)
tree882cbe797390f1a726174a8283e00c3e62404a5e /app/views/projects/jobs
parent7b1affd426fbf24445df25e439cbda9b6bd4b046 (diff)
parent0c4f512bae5b5e67658dd9707430185f1a1f97cc (diff)
downloadgitlab-ce-b85d69d1f0b379b2b055eca9695f8055b00e77b5.tar.gz
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/projects/jobs')
-rw-r--r--app/views/projects/jobs/_sidebar.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index bddb587ddc6..f2db71e8838 100644
--- a/app/views/projects/jobs/_sidebar.html.haml
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -11,7 +11,7 @@
#js-details-block-vue
- if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
- .block{ class: ("block-first" if !@build.coverage) }
+ .block
.title
Job artifacts
- if @build.artifacts_expired?
@@ -37,7 +37,7 @@
Browse
- if @build.trigger_request
- .build-widget
+ .build-widget.block
%h4.title
Trigger
@@ -55,7 +55,7 @@
.js-build-variable.trigger-build-variable= key
.js-build-value.trigger-build-value= value
- .block
+ %div{ class: (@build.pipeline.stages_count > 1 ? "block" : "block-last") }
%p
Commit
= link_to @build.pipeline.short_sha, project_commit_path(@project, @build.pipeline.sha), class: 'commit-sha link-commit'
@@ -69,7 +69,7 @@
- if @build.pipeline.stages_count > 1
.dropdown.build-dropdown
- .title
+ %div
%span{ class: "ci-status-icon-#{@build.pipeline.status}" }
= ci_icon_for_status(@build.pipeline.status)
Pipeline