[ci skip] Fixes sidebar & scroll

3 files changed, 19 insertions, 19 deletions

diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index 81abf044af0..571ca9b58d1 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -65,7 +65,6 @@
         'isTraceSizeVisible',
         'isScrollTopDisabled',
         'isScrollBottomDisabled',
-        'isScrollingDown',
       ]),
       ...mapGetters(['headerActions', 'headerTime', 'shouldRenderCalloutMessage', 'jobHasTrace']),
       /**
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
index 1f91a2cfbaa..e204f09fb28 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -251,19 +251,20 @@
             </a>
           </div>
         </div>
+        <artifacts-block
+          v-if="hasArtifact"
+          :artifact="job.artifact"
+        />
+        <trigger-block
+          v-if="hasTriggers"
+          :trigger="job.trigger"
+        />
+        <commit-block
+          :is-last-block="hasStages"
+          :commit="commit"
+          :merge-request="job.merge_request"
+        />
       </div>
-      <artifacts-block
-        v-if="hasArtifact"
-        :artifact="job.artifact"
-      />
-      <trigger-block
-        v-if="hasTriggers"
-        :trigger="job.trigger"
-      />
-      <commit-block
-        :is-last-block="hasStages"
-        :commit="commit"
-        :merge-request="job.merge_request"
-      />
+    </div>
   </aside>
 </template>
diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js
index 0d38b843400..b2965579f14 100644
--- a/app/assets/javascripts/jobs/store/actions.js
+++ b/app/assets/javascripts/jobs/store/actions.js
@@ -91,7 +91,7 @@ export const scrollBottom = ({ commit, dispatch }) => {
 
 export const toggleScrollButtons = ({ dispatch }) => {
   console.log('yo!');
-  debugger;
+
   if (canScroll()) {
     if (isScrolledToMiddle()) {
       dispatch('enableScrollTop');
@@ -113,8 +113,8 @@ export const disableScrollBottom = ({ commit }) => commit(types.DISABLE_SCROLL_B
 export const disableScrollTop = ({ commit }) => commit(types.DISABLE_SCROLL_TOP);
 export const enableScrollBottom = ({ commit }) => commit(types.ENABLE_SCROLL_BOTTOM);
 export const enableScrollTop = ({ commit }) => commit(types.ENABLE_SCROLL_TOP);
-export const toggleScrollAnimation = ({ commit}, toggle) => commit(types.TOGGLE_SCROLL_ANIMATION, toggle)
-
+export const toggleScrollAnimation = ({ commit }, toggle) =>
+  commit(types.TOGGLE_SCROLL_ANIMATION, toggle);
 
 export const requestTrace = ({ commit }) => commit(types.REQUEST_TRACE);
 
@@ -139,13 +139,13 @@ export const fetchTrace = ({ dispatch, state }) => {
         }, 4000);
       } else {
         dispatch('stopPollingTrace');
-        dispatch('toggleScrollAnimation');
+        dispatch('toggleScrollAnimation', false);
       }
     })
     .catch(() => dispatch('receiveTraceError'))
     .then(() => {
       if (isScrolledToBottom()) {
-        dispatch('scrollBottom')
+        dispatch('scrollBottom');
       }
     })
     .then(() => {