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) ![Screen_Shot_2016-06-13_at_11.42.42](/uploads/6e0577f46a0cc7b4f2f13b17c85d97da/Screen_Shot_2016-06-13_at_11.42.42.png) See merge request !4621

Merge branch 'build-scroll-controls-on-complete' into 'master'
666b5651 · Jacob Schatz · db66312c · 8c367c91 · 666b5651
Commit 666b5651 authored Jun 16, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

show.html.haml app/views/projects/builds/show.html.haml +5 -5

No files found.
--- 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")