diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
| commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
| tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /spec/models | |
| parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) | |
| download | gitlab-ce-e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 52cd31ee65f..cbb837c139e 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -3332,7 +3332,7 @@ describe MergeRequest do describe 'check_state?' do it 'indicates whether MR is still checking for mergeability' do state_machine = described_class.state_machines[:merge_status] - check_states = [:unchecked, :cannot_be_merged_recheck, :checking] + check_states = [:unchecked, :cannot_be_merged_recheck, :cannot_be_merged_rechecking, :checking] check_states.each do |merge_status| expect(state_machine.check_state?(merge_status)).to be true |