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
3b06ee00
Commit
3b06ee00
authored
Mar 03, 2022
by
Marius Bobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_pipeline_merge_request_presence_check feature flag
Changelog: other
parent
2e2cc348
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
22 deletions
+1
-22
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-5
config/feature_flags/development/ci_pipeline_merge_request_presence_check.yml
.../development/ci_pipeline_merge_request_presence_check.yml
+0
-8
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+0
-9
No files found.
app/models/ci/pipeline.rb
View file @
3b06ee00
...
@@ -1164,11 +1164,7 @@ module Ci
...
@@ -1164,11 +1164,7 @@ module Ci
end
end
def
merge_request?
def
merge_request?
if
Feature
.
enabled?
(
:ci_pipeline_merge_request_presence_check
,
default_enabled: :yaml
)
merge_request_id
.
present?
&&
merge_request
.
present?
merge_request_id
.
present?
&&
merge_request
.
present?
else
merge_request_id
.
present?
end
end
end
def
external_pull_request?
def
external_pull_request?
...
...
config/feature_flags/development/ci_pipeline_merge_request_presence_check.yml
deleted
100644 → 0
View file @
2e2cc348
---
name
:
ci_pipeline_merge_request_presence_check
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78574
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/350734
milestone
:
'
14.8'
type
:
development
group
:
group::pipeline execution
default_enabled
:
true
spec/models/ci/pipeline_spec.rb
View file @
3b06ee00
...
@@ -438,15 +438,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
...
@@ -438,15 +438,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
it
{
expect
(
pipeline
).
not_to
be_merge_request
}
it
{
expect
(
pipeline
).
not_to
be_merge_request
}
end
end
context
'when the feature flag is disabled'
do
before
do
stub_feature_flags
(
ci_pipeline_merge_request_presence_check:
false
)
pipeline
.
update!
(
merge_request_id:
non_existing_record_id
)
end
it
{
expect
(
pipeline
).
to
be_merge_request
}
end
end
end
describe
'#detached_merge_request_pipeline?'
do
describe
'#detached_merge_request_pipeline?'
do
...
...
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