Commit 33ec6455 authored by Markus Koller's avatar Markus Koller

Merge branch '281878-add-project-to-ff' into 'master'

Add project scope to FF skip_dag_manual_and_delayed_jobs

See merge request gitlab-org/gitlab!52096
parents 189526b7 51829ee8
...@@ -26,7 +26,7 @@ module Ci ...@@ -26,7 +26,7 @@ module Ci
end end
def valid_statuses_for_build(build) def valid_statuses_for_build(build)
if ::Feature.enabled?(:skip_dag_manual_and_delayed_jobs, default_enabled: :yaml) if ::Feature.enabled?(:skip_dag_manual_and_delayed_jobs, build.project, default_enabled: :yaml)
current_valid_statuses_for_build(build) current_valid_statuses_for_build(build)
else else
legacy_valid_statuses_for_build(build) legacy_valid_statuses_for_build(build)
......
...@@ -146,9 +146,11 @@ RSpec.describe Ci::ProcessBuildService, '#execute' do ...@@ -146,9 +146,11 @@ RSpec.describe Ci::ProcessBuildService, '#execute' do
end end
end end
context 'when FF skip_dag_manual_and_delayed_jobs is disabled' do context 'when FF skip_dag_manual_and_delayed_jobs is disabled on the project' do
let_it_be(:other_project) { create(:project) }
before do before do
stub_feature_flags(skip_dag_manual_and_delayed_jobs: false) stub_feature_flags(skip_dag_manual_and_delayed_jobs: other_project)
end end
where(:build_when, :current_status, :after_status) do where(:build_when, :current_status, :after_status) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment