diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
commit | c6c7437861bff9572747674095c4dfbdfbea4988 (patch) | |
tree | 237d1ed922193f19ae326923457344c082003788 /app/models | |
parent | d80f3cd75e700b6e62910865bfd36734644ffa89 (diff) | |
download | gitlab-ce-c6c7437861bff9572747674095c4dfbdfbea4988.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request_diff_commit.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request_diff_commit.rb b/app/models/merge_request_diff_commit.rb index 7310aa4f580..2819ea7ce1e 100644 --- a/app/models/merge_request_diff_commit.rb +++ b/app/models/merge_request_diff_commit.rb @@ -10,8 +10,9 @@ class MergeRequestDiffCommit < ApplicationRecord sha_attribute :sha alias_attribute :id, :sha + # Deprecated; use `bulk_insert!` from `BulkInsertSafe` mixin instead. + # cf. https://gitlab.com/gitlab-org/gitlab/issues/207989 for progress def self.create_bulk(merge_request_diff_id, commits) - warn 'Deprecated; use `bulk_insert` from `BulkInsertSafe` mixin instead' rows = commits.map.with_index do |commit, index| # See #parent_ids. commit_hash = commit.to_hash.except(:parent_ids) |