fix some issues and improved error output for forking

2 files changed, 9 insertions, 2 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 03429fb7a46..e4a9d17a20c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1019,7 +1019,14 @@ class Project < ActiveRecord::Base
   end
 
   def mark_import_as_failed(error_message)
+    original_errors = errors.dup
+    sanitized_message = Gitlab::UrlSanitizer.sanitize(error_message)
+
     import_fail
-    update_column(:import_error, Gitlab::UrlSanitizer.sanitize(error_message))
+    update_column(:import_error, sanitized_message)
+  rescue ActiveRecord::ActiveRecordError => e
+    Rails.logger.error("Error setting import status to failed: #{e.message}. Original error: #{sanitized_message}")
+  ensure
+    @errors = original_errors
   end
 end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index b73389f0489..61cac5419ad 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -59,7 +59,7 @@ module Projects
       if @project.errors.empty?
         @project.add_import_job if @project.import?
       else
-        fail(error: @project.errors.join(', '))
+        fail(error: @project.errors.full_messages.join(', '))
       end
       @project
     rescue => e