kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add auto merge strategies

Browse source 
AddToMergeTrainWhenPipelineSucceeds and MergeTrain
This commit is contained in:
Shinya Maeda 2019-05-24 17:52:51 +07:00
parent 9eb40fbfd6
commit 29a16fbf9e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/services/auto_merge_service_spec.rb
View file

@ -10,8 +10,8 @@ describe AutoMergeService do
describe '.all_strategies' do describe '.all_strategies' do
subject { described_class.all_strategies } subject { described_class.all_strategies }
it 'returns all strategies' do it 'includes merge when pipeline succeeds' do
is_expected.to eq(AutoMergeService::STRATEGIES) is_expected.to include(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
end end
end end