Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/merge_to_ref_service.rb')
-rw-r--r--app/services/merge_requests/merge_to_ref_service.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb
index e07e0c985b4..eda652c4b9a 100644
--- a/app/services/merge_requests/merge_to_ref_service.rb
+++ b/app/services/merge_requests/merge_to_ref_service.rb
@@ -66,6 +66,16 @@ module MergeRequests
end
def commit
+ if Feature.enabled?(:cache_merge_to_ref_calls, project, default_enabled: false)
+ Rails.cache.fetch(cache_key, expires_in: 1.day) do
+ extracted_merge_to_ref
+ end
+ else
+ extracted_merge_to_ref
+ end
+ end
+
+ def extracted_merge_to_ref
repository.merge_to_ref(current_user,
source_sha: source,
branch: merge_request.target_branch,
@@ -76,5 +86,9 @@ module MergeRequests
rescue Gitlab::Git::PreReceiveError, Gitlab::Git::CommandError => error
raise MergeError, error.message
end
+
+ def cache_key
+ [:merge_to_ref_service, project.full_path, merge_request.target_branch_sha, merge_request.source_branch_sha]
+ end
end
end