Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 17 deletions

diff --git a/lib/gitlab/database_importers/self_monitoring/project/delete_service.rb b/lib/gitlab/database_importers/self_monitoring/project/delete_service.rb
index bce0819b700..998977b4000 100644
--- a/lib/gitlab/database_importers/self_monitoring/project/delete_service.rb
+++ b/lib/gitlab/database_importers/self_monitoring/project/delete_service.rb
@@ -9,8 +9,7 @@ module Gitlab
           include SelfMonitoring::Helpers
 
           steps :validate_self_monitoring_project_exists,
-            :destroy_project_owner,
-            :delete_project_id
+            :destroy_project
 
           def initialize
             super(nil)
@@ -30,29 +29,16 @@ module Gitlab
             success(result)
           end
 
-          def destroy_project_owner(result)
+          def destroy_project(result)
             return success(result) unless project_created?
 
-            if self_monitoring_project.owner.destroy
+            if self_monitoring_project.destroy
               success(result)
             else
               log_error(self_monitoring_project.errors.full_messages)
               error(_('Error deleting project. Check logs for error details.'))
             end
           end
-
-          def delete_project_id(result)
-            update_result = application_settings.update(
-              instance_administration_project_id: nil
-            )
-
-            if update_result
-              success(result)
-            else
-              log_error("Could not delete self monitoring project ID, errors: %{errors}" % { errors: application_settings.errors.full_messages })
-              error(_('Could not delete project ID'))
-            end
-          end
         end
       end
     end