diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 03:10:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 03:10:42 +0300 |
| commit | 9f1ce98c1d456b962fc43ec99180e042592fa307 (patch) | |
| tree | 9083abfee167f7d31738571b0d29ecd2d8b12820 /app/services | |
| parent | 919e3e3cd83e76dba137ef9bcc4746214c2085ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 8fa80dc3513..75e1adec41b 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -39,11 +39,7 @@ module MergeRequests # open while the Gitaly RPC waits. To avoid an idle in transaction # timeout, we do this before we attempt to save the merge request. - if Feature.enabled?(:async_merge_request_diff_creation, merge_request.target_project) - merge_request.skip_ensure_merge_request_diff = true - else - merge_request.eager_fetch_ref! - end + merge_request.skip_ensure_merge_request_diff = true end def set_projects! |