summaryrefslogtreecommitdiff
path: root/app/views/projects/jobs
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-07-05 11:32:22 +0000
committerPhil Hughes <me@iamphill.com>2017-07-05 11:32:22 +0000
commit2c1f000e3e6c12b62c58067072dc8bc9bd361410 (patch)
tree0b6b987e0d19d179658af04b04a19d1675beadb0 /app/views/projects/jobs
parent9e4aef263ae9df7d5b8b612fffce5800de9b16cb (diff)
downloadgitlab-ce-2c1f000e3e6c12b62c58067072dc8bc9bd361410.tar.gz
Revert change to design. Go back to scrollable page
Diffstat (limited to 'app/views/projects/jobs')
-rw-r--r--app/views/projects/jobs/show.html.haml11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index c73bae0a2c9..e9bc1068417 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -54,13 +54,14 @@
- else
Job has been erased #{time_ago_with_tooltip(@build.erased_at)}
- .build-trace-container#build-trace
- .top-bar.sticky
+ .build-trace-container.prepend-top-default
+ .top-bar.js-top-bar
.js-truncated-info.truncated-info.hidden<
Showing last
%span.js-truncated-info-size.truncated-info-size><
KiB of log -
%a.js-raw-link.raw-link{ href: raw_namespace_project_job_path(@project.namespace, @project, @build) }>< Complete Raw
+
.controllers
- if @build.has_trace?
= link_to raw_namespace_project_job_path(@project.namespace, @project, @build),
@@ -82,10 +83,12 @@
.has-tooltip.controllers-buttons{ title: 'Scroll to bottom', data: { placement: 'top', container: 'body'} }
%button.js-scroll-down.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true }
= custom_icon('scroll_down')
- .bash.sticky.js-scroll-container
- %code.js-build-output
+
+ %pre.build-trace#build-trace
+ %code.bash.js-build-output
.build-loader-animation.js-build-refresh
+
= render "sidebar"
.js-build-options{ data: javascript_build_options }