Add latest changes from gitlab-org/gitlab@master

app/models/project.rb

@@ -1997,7 +1997,7 @@ class Project < ApplicationRecord
     # of a model instance (e.g. an Issue).
     InternalId.flush_records!(project: self)
 
-    import_state.finish
+    import_state&.finish
     update_project_counter_caches
     after_create_default_branch
     join_pool_repository

app/views/shared/web_hooks/_form.html.haml

@@ -33,7 +33,7 @@
       = form.label :note_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Comments')
       %p.text-muted.gl-ml-1
-        = s_('Webhooks|A comment is added to an issue.')
+        = s_('Webhooks|A comment is added to an issue or merge request.')
     %li
       = form.check_box :confidential_note_events, class: 'form-check-input'
       = form.label :confidential_note_events, class: 'list-label form-check-label gl-ml-1' do

lib/bulk_imports/common/pipelines/entity_finisher.rb

@@ -30,6 +30,8 @@ module BulkImports
             pipeline_class: self.class.name,
             message: "Entity #{entity.status_name}"
           )
+
+          context.portable.try(:after_import)
         end
 
         private

locale/gitlab.pot

@@ -42107,7 +42107,7 @@ msgstr ""
 msgid "Webhooks|A comment is added to a confidential issue."
 msgstr ""
 
-msgid "Webhooks|A comment is added to an issue."
+msgid "Webhooks|A comment is added to an issue or merge request."
 msgstr ""
 
 msgid "Webhooks|A confidential issue is created, updated, closed, or reopened."

spec/lib/bulk_imports/common/pipelines/entity_finisher_spec.rb

@@ -21,6 +21,8 @@ RSpec.describe BulkImports::Common::Pipelines::EntityFinisher do
         )
     end
 
+    expect(context.portable).to receive(:try).with(:after_import)
+
     expect { subject.run }
       .to change(entity, :status_name).to(:finished)
   end