Merge branch 'a-bunch-of-import-improvements' into 'master'

A bunch of import improvements

See merge request gitlab-org/gitlab!21142

app/models/concerns/diff_positionable_note.rb

@@ -5,7 +5,7 @@ module DiffPositionableNote
   included do
     delegate :on_text?, :on_image?, to: :position, allow_nil: true
     before_validation :set_original_position, on: :create
-    before_validation :update_position, on: :create, if: :on_text?
+    before_validation :update_position, on: :create, if: :on_text?, unless: :importing?
 
     serialize :original_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize
     serialize :position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize

app/models/diff_note.rb

@@ -21,8 +21,8 @@ class DiffNote < Note
   validate :positions_complete
   validate :verify_supported
 
-  before_validation :set_line_code, if: :on_text?
-  after_save :keep_around_commits
+  before_validation :set_line_code, if: :on_text?, unless: :importing?
+  after_save :keep_around_commits, unless: :importing?
   after_commit :create_diff_file, on: :create
 
   def discussion_class(*)

app/models/merge_request.rb

@@ -242,7 +242,7 @@ class MergeRequest < ApplicationRecord
 
   ignore_column :state, remove_with: '12.7', remove_after: '2019-12-22'
 
-  after_save :keep_around_commit
+  after_save :keep_around_commit, unless: :importing?
 
   alias_attribute :project, :target_project
   alias_attribute :project_id, :target_project_id

app/models/merge_request_diff.rb

@@ -164,7 +164,7 @@ class MergeRequestDiff < ApplicationRecord
     # hooks that run when an attribute was changed are run twice.
     reset
 
-    keep_around_commits
+    keep_around_commits unless importing?
   end
 
   def set_as_latest_diff

app/models/note.rb

@@ -155,9 +155,9 @@ class Note < ApplicationRecord
   after_initialize :ensure_discussion_id
   before_validation :nullify_blank_type, :nullify_blank_line_code
   before_validation :set_discussion_id, on: :create
-  after_save :keep_around_commit, if: :for_project_noteable?
-  after_save :expire_etag_cache
-  after_save :touch_noteable
+  after_save :keep_around_commit, if: :for_project_noteable?, unless: :importing?
+  after_save :expire_etag_cache, unless: :importing?
+  after_save :touch_noteable, unless: :importing?
   after_destroy :expire_etag_cache
 
   class << self

ee/app/models/draft_note.rb

@@ -56,6 +56,10 @@ class DraftNote < ApplicationRecord
     commit_id.present?
   end
 
+  def importing?
+    false
+  end
+
   def resolvable?
     false
   end