Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
51829ee8
Commit
51829ee8
authored
4 years ago
by
Furkan Ayhan
Committed by
Markus Koller
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add project scope to FF skip_dag_manual_and_delayed_jobs
We forgot to add this.
parent
5ff6c862
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/services/ci/process_build_service.rb
app/services/ci/process_build_service.rb
+1
-1
spec/services/ci/process_build_service_spec.rb
spec/services/ci/process_build_service_spec.rb
+4
-2
No files found.
app/services/ci/process_build_service.rb
View file @
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
)
...
...
This diff is collapsed.
Click to expand it.
spec/services/ci/process_build_service_spec.rb
View file @
51829ee8
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment