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

Merge branch 'add-merge-train-auto-merge-strategy-ce' into 'master'

Browse source 
(CE Port) [New Auto Merge Strategy] Merge Train

See merge request gitlab-org/gitlab-ce!29485
This commit is contained in:
Kamil Trzciński 2019-06-12 13:47:24 +00:00
commit 4716cae4f8
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
subject { described_class.all_strategies }
it 'returns all strategies' do
is_expected.to eq(AutoMergeService::STRATEGIES)
it 'includes merge when pipeline succeeds' do
is_expected.to include(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
end
end