From 5d5eae4c5781aee305cea1607d4f846cbf3d88a5 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 9 Jun 2017 18:05:13 -0500 Subject: Fix bad merge --- .../pipelines/components/graph/graph_component.vue | 18 ------------------ app/models/commit_status.rb | 1 - .../merge_when_pipeline_succeeds_spec.rb | 2 +- 3 files changed, 1 insertion(+), 20 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; - }, }, }; 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) diff --git a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb index 67c608da59d..09f889d4dd6 100644 --- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb @@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do click_link 'Merge when pipeline succeeds' expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds." - expect(page).to have_content "The source branch will be removed." + expect(page).to have_content "The source branch will not be removed." expect(page).to have_link "Cancel automatic merge" end end -- cgit v1.2.1