Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

3 files changed, 12 insertions, 5 deletions

diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index 6b163cd1b2d..f3253027d57 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -442,10 +442,9 @@ module Gitlab
       end
 
       def uid(rep_object)
-        # We want this explicit to only be username on the FF
-        # Otherwise, match email.
-        # There should be no default fall-through on username. Fall-through to import user
-        if Feature.enabled?(:bitbucket_server_user_mapping_by_username)
+        # We want this to only match either username or email depending on the flag state.
+        # There should be no fall-through.
+        if Feature.enabled?(:bitbucket_server_user_mapping_by_username, type: :ops)
           find_user_id(by: :username, value: rep_object.author_username)
         else
           find_user_id(by: :email, value: rep_object.author_email)
diff --git a/lib/gitlab/bitbucket_server_import/importers/repository_importer.rb b/lib/gitlab/bitbucket_server_import/importers/repository_importer.rb
index cd09ac40e9f..e7a9adf2beb 100644
--- a/lib/gitlab/bitbucket_server_import/importers/repository_importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importers/repository_importer.rb
@@ -17,6 +17,8 @@ module Gitlab
             project.repository.import_repository(project.import_url)
             project.repository.fetch_as_mirror(project.import_url, refmap: refmap)
 
+            validate_repository_size!
+
             update_clone_time
           end
 
@@ -48,7 +50,13 @@ module Gitlab
         def update_clone_time
           project.touch(:last_repository_updated_at)
         end
+
+        def validate_repository_size!
+          # Defined in EE
+        end
       end
     end
   end
 end
+
+Gitlab::BitbucketServerImport::Importers::RepositoryImporter.prepend_mod
diff --git a/lib/gitlab/bitbucket_server_import/user_finder.rb b/lib/gitlab/bitbucket_server_import/user_finder.rb
index f96454eb2cc..68bd2d4851a 100644
--- a/lib/gitlab/bitbucket_server_import/user_finder.rb
+++ b/lib/gitlab/bitbucket_server_import/user_finder.rb
@@ -24,7 +24,7 @@ module Gitlab
       def uid(object)
         # We want this to only match either username or email depending on the flag state.
         # There should be no fall-through.
-        if Feature.enabled?(:bitbucket_server_user_mapping_by_username)
+        if Feature.enabled?(:bitbucket_server_user_mapping_by_username, type: :ops)
           find_user_id(by: :username, value: object.is_a?(Hash) ? object[:author_username] : object.author_username)
         else
           find_user_id(by: :email, value: object.is_a?(Hash) ? object[:author_email] : object.author_email)