Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/app/models/merge_request_context_commit_diff_file.rb b/app/models/merge_request_context_commit_diff_file.rb
new file mode 100644
index 00000000000..9dce7c53ab6
--- /dev/null
+++ b/app/models/merge_request_context_commit_diff_file.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class MergeRequestContextCommitDiffFile < ApplicationRecord
+  include Gitlab::EncodingHelper
+  include ShaAttribute
+  include DiffFile
+
+  belongs_to :merge_request_context_commit, inverse_of: :diff_files
+
+  sha_attribute :sha
+  alias_attribute :id, :sha
+
+  # create MergeRequestContextCommitDiffFile by given diff file record(s)
+  def self.bulk_insert(*args)
+    Gitlab::Database.bulk_insert('merge_request_context_commit_diff_files', *args)
+  end
+end