diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-22 18:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-22 18:09:31 +0300 |
| commit | 06d4ce7ee0c0f9cf84a6799d97f64dd710d6e9f6 (patch) | |
| tree | 6c975e5931ee5655f2aa9dbb0c087604d513ec5a /spec/services/ci/register_job_service_spec.rb | |
| parent | cea25900b73fcb7029845eeca5e5a9170349f1dd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/ci/register_job_service_spec.rb')
| -rw-r--r-- | spec/services/ci/register_job_service_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb index 401a40bbb39..66d96c08fe1 100644 --- a/spec/services/ci/register_job_service_spec.rb +++ b/spec/services/ci/register_job_service_spec.rb @@ -228,6 +228,7 @@ module Ci context 'when the use_distinct_in_register_job_object_hierarchy feature flag is enabled' do before do stub_feature_flags(use_distinct_in_register_job_object_hierarchy: true) + stub_feature_flags(use_distinct_for_all_object_hierarchy: true) end it 'calls DISTINCT' do @@ -238,6 +239,7 @@ module Ci context 'when the use_distinct_in_register_job_object_hierarchy feature flag is disabled' do before do stub_feature_flags(use_distinct_in_register_job_object_hierarchy: false) + stub_feature_flags(use_distinct_for_all_object_hierarchy: false) end it 'does not call DISTINCT' do |