Commit ce3f0a5e authored by Jarka Košanová's avatar Jarka Košanová

Merge branch 'remove-retarget_merge_requests-ff' into 'master'

Remove retarget_merge_requests feature flag

See merge request gitlab-org/gitlab!72782
parents 40611c04 8d38b170
...@@ -5,8 +5,6 @@ module MergeRequests ...@@ -5,8 +5,6 @@ module MergeRequests
MAX_RETARGET_MERGE_REQUESTS = 4 MAX_RETARGET_MERGE_REQUESTS = 4
def execute(merge_request) def execute(merge_request)
return unless Feature.enabled?(:retarget_merge_requests, merge_request.target_project, default_enabled: :yaml)
# we can only retarget MRs that are targeting the same project # we can only retarget MRs that are targeting the same project
return unless merge_request.for_same_project? && merge_request.merged? return unless merge_request.for_same_project? && merge_request.merged?
......
---
name: retarget_merge_requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53710
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320895
milestone: '13.9'
type: development
group: group::memory
default_enabled: true
...@@ -172,11 +172,6 @@ is set for deletion, the merge request widget displays the ...@@ -172,11 +172,6 @@ is set for deletion, the merge request widget displays the
> - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9. > - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10. > - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10.
FLAG:
On self-managed GitLab, by default this feature is available. To hide the feature,
ask an administrator to
[disable the `retarget_merge_requests` flag](../../../administration/feature_flags.md).
In specific circumstances, GitLab can retarget the destination branch of In specific circumstances, GitLab can retarget the destination branch of
open merge request, if the destination branch merges while the merge request is open merge request, if the destination branch merges while the merge request is
open. Merge requests are often chained in this manner, with one merge request open. Merge requests are often chained in this manner, with one merge request
......
...@@ -45,14 +45,6 @@ RSpec.describe MergeRequests::RetargetChainService do ...@@ -45,14 +45,6 @@ RSpec.describe MergeRequests::RetargetChainService do
.from(merge_request.source_branch) .from(merge_request.source_branch)
.to(merge_request.target_branch) .to(merge_request.target_branch)
end end
context 'when FF retarget_merge_requests is disabled' do
before do
stub_feature_flags(retarget_merge_requests: false)
end
include_examples 'does not retarget merge request'
end
end end
context 'in the same project' do context 'in the same project' 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