diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-06 15:17:22 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-06 15:17:22 +0300 |
| commit | 35bf473f2a6920a2de1b434ad264fc30a73e6177 (patch) | |
| tree | 4945fe2e23492eef6906c478fb55703acaf7ee54 /app/views | |
| parent | 38f95d6c81265521869edd6c46e1c7209ff27b5b (diff) | |
| parent | 7644edd8aae6d2959790f35302d3f0ec5767097d (diff) | |
Merge branch 'jivl-backport-scroll-utilities' into 'master'
Backport scroll utilities for the job log component
See merge request gitlab-org/gitlab-ce!19221
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/builds/_build_output.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index ec9a04c0eab..1f33bb3a129 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -86,9 +86,7 @@ %button.js-scroll-down.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true } = custom_icon('scroll_down') - %pre.build-trace#build-trace - %code.bash.js-build-output - .build-loader-animation.js-build-refresh + = render 'shared/builds/build_output' - else = render "empty_states" diff --git a/app/views/shared/builds/_build_output.html.haml b/app/views/shared/builds/_build_output.html.haml new file mode 100644 index 00000000000..07f1501fadd --- /dev/null +++ b/app/views/shared/builds/_build_output.html.haml @@ -0,0 +1,3 @@ +%pre.build-trace#build-trace + %code.bash.js-build-output + .build-loader-animation.js-build-refresh |