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
1ec64510
Commit
1ec64510
authored
Jan 21, 2020
by
Igor Drozdov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove merge_requests_conditional_mergeability_check feature flag
parent
f74fa6b1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
14 deletions
+4
-14
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+3
-13
No files found.
app/models/merge_request.rb
View file @
1ec64510
...
@@ -818,7 +818,7 @@ class MergeRequest < ApplicationRecord
...
@@ -818,7 +818,7 @@ class MergeRequest < ApplicationRecord
end
end
def
check_mergeability
(
async:
false
)
def
check_mergeability
(
async:
false
)
return
if
Feature
.
enabled?
(
:merge_requests_conditional_mergeability_check
,
default_enabled:
true
)
&&
!
recheck_merge_status?
return
unless
recheck_merge_status?
check_service
=
MergeRequests
::
MergeabilityCheckService
.
new
(
self
)
check_service
=
MergeRequests
::
MergeabilityCheckService
.
new
(
self
)
...
...
spec/models/merge_request_spec.rb
View file @
1ec64510
...
@@ -2140,22 +2140,12 @@ describe MergeRequest do
...
@@ -2140,22 +2140,12 @@ describe MergeRequest do
subject
.
mark_as_mergeable!
subject
.
mark_as_mergeable!
end
end
context
'and merge_requests_conditional_mergeability_check feature flag is enabled'
do
it
'does not call MergeabilityCheckService'
do
it
'does not call MergeabilityCheckService'
do
expect
(
MergeRequests
::
MergeabilityCheckService
).
not_to
receive
(
:new
)
expect
(
MergeRequests
::
MergeabilityCheckService
).
not_to
receive
(
:new
)
subject
.
check_mergeability
subject
.
check_mergeability
end
end
end
end
context
'and merge_requests_conditional_mergeability_check feature flag is disabled'
do
before
do
stub_feature_flags
(
merge_requests_conditional_mergeability_check:
false
)
end
it_behaves_like
'method that executes MergeabilityCheckService'
end
end
end
end
describe
'#mergeable_state?'
do
describe
'#mergeable_state?'
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