JS review changes and fixed conflicts

app/assets/javascripts/pipeline.js.es6

@@ -10,10 +10,10 @@
       const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
       const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
       const $btnText = $(this).find('.toggle-btn-text');
+      const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
 
       $($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
 
-      const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
 
       graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
     }