Fix bad merge

2 files changed, 0 insertions, 19 deletions

diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index 61cd623dd00..77cbaeb43ef 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -48,24 +48,6 @@
 
         return className;
       },
-
-      isFirstColumn(index) {
-        return index === 0;
-      },
-
-      stageConnectorClass(index, stage) {
-        let className;
-
-        // If it's the first stage column and only has one job
-        if (index === 0 && stage.groups.length === 1) {
-          className = 'no-margin';
-        } else if (index > 0) {
-          // If it is not the first column
-          className = 'left-margin';
-        }
-
-        return className;
-      },
     },
   };
 </script>
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index b9f1948c9eb..55c16f7e1fd 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -89,7 +89,6 @@ class CommitStatus < ActiveRecord::Base
           else
             PipelineUpdateWorker.perform_async(pipeline.id)
           end
-          ExpireJobCacheWorker.perform_async(commit_status.id)
         end
 
         ExpireJobCacheWorker.perform_async(commit_status.id)