diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 16:52:23 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 16:52:23 +0000 |
| commit | 666b5651689d3a5a7e6b2e7c18c7c818c81ead84 (patch) | |
| tree | 8188e6b1e87ebf477372df25bf42920ab6337778 | |
| parent | db66312cdb40c4d87dbf0d99da0fd2316676f7c7 (diff) | |
| parent | 8c367c918d3c439f8dad46ed1c3f3d661da1a88c (diff) | |
| download | gitlab-ce-666b5651689d3a5a7e6b2e7c18c7c818c81ead84.tar.gz | |
Merge branch 'build-scroll-controls-on-complete' into 'master'
Shows build scroll buttons after build is complete
## What does this MR do?
Shows the build scroll buttons whenever there is a build trace. Previously they were only shown when the build was active.
## What are the relevant issue numbers?
Closes #18515
## Screenshots (if relevant)
See merge request !4621
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index a26f8aeb315..4e2702c2e44 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -48,16 +48,16 @@ - if @build.active? .autoscroll-container %button.btn.btn-success.btn-sm#autoscroll-button{:type => "button", :data => {:state => 'disabled'}} enable autoscroll - #js-build-scroll.scroll-controls - = link_to '#build-trace', class: 'btn' do - %i.fa.fa-angle-up - = link_to '#down-build-trace', class: 'btn' do - %i.fa.fa-angle-down - if @build.erased? .erased.alert.alert-warning - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)} - else + #js-build-scroll.scroll-controls + = link_to '#build-trace', class: 'btn' do + %i.fa.fa-angle-up + = link_to '#down-build-trace', class: 'btn' do + %i.fa.fa-angle-down %pre.build-trace#build-trace %code.bash.js-build-output = icon("refresh spin", class: "js-build-refresh") |