Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.

7 files changed, 15 insertions, 67 deletions

diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index eb73948006e..ba50305dbd5 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -4,10 +4,6 @@ module Projects
       @project.issues.visible_to_user(current_user).opened.select([:iid, :title])
     end
 
-    def milestones
-      @project.milestones.active.reorder(due_date: :asc, title: :asc).select([:iid, :title])
-    end
-
     def merge_requests
       @project.merge_requests.opened.select([:iid, :title])
     end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 61cac5419ad..501e58c1407 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -6,7 +6,6 @@ module Projects
 
     def execute
       forked_from_project_id = params.delete(:forked_from_project_id)
-      import_data = params.delete(:import_data)
 
       @project = Project.new(params)
 
@@ -50,20 +49,22 @@ module Projects
         @project.build_forked_project_link(forked_from_project_id: forked_from_project_id)
       end
 
-      save_project_and_import_data(import_data)
+      Project.transaction do
+        @project.save
 
-      @project.import_start if @project.import?
+        if @project.persisted? && !@project.import?
+          raise 'Failed to create repository' unless @project.create_repository
+        end
+      end
 
       after_create_actions if @project.persisted?
 
-      if @project.errors.empty?
-        @project.add_import_job if @project.import?
-      else
-        fail(error: @project.errors.full_messages.join(', '))
-      end
       @project
     rescue => e
-      fail(error: e.message)
+      message = "Unable to save project: #{e.message}"
+      Rails.logger.error(message)
+      @project.errors.add(:base, message) if @project
+      @project
     end
 
     protected
@@ -92,30 +93,8 @@ module Projects
       unless @project.group
         @project.team << [current_user, :master, current_user]
       end
-    end
-
-    def save_project_and_import_data(import_data)
-      Project.transaction do
-        @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
-
-        if @project.save && !@project.import?
-          raise 'Failed to create repository' unless @project.create_repository
-        end
-      end
-    end
-
-    def fail(error:)
-      message = "Unable to save project. Error: #{error}"
-      message << "Project ID: #{@project.id}" if @project && @project.id
-
-      Rails.logger.error(message)
-
-      if @project && @project.import?
-        @project.errors.add(:base, message)
-        @project.mark_import_as_failed(message)
-      end
 
-      @project
+      @project.import_start if @project.import?
     end
   end
 end
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index f09072975c3..19aab999e00 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -26,10 +26,6 @@ module Projects
       Project.transaction do
         project.destroy!
 
-        unless remove_registry_tags
-          raise_error('Failed to remove project container registry. Please try again or contact administrator')
-        end
-
         unless remove_repository(repo_path)
           raise_error('Failed to remove project repository. Please try again or contact administrator')
         end
@@ -39,7 +35,7 @@ module Projects
         end
       end
 
-      log_info("Project \"#{project.path_with_namespace}\" was removed")
+      log_info("Project \"#{project.name}\" was removed")
       system_hook_service.execute_hooks_for(project, :destroy)
       true
     end
@@ -63,12 +59,6 @@ module Projects
       end
     end
 
-    def remove_registry_tags
-      return true unless Gitlab.config.registry.enabled
-
-      project.container_registry_repository.delete_tags
-    end
-
     def raise_error(message)
       raise DestroyError.new(message)
     end
diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb
index de6dc38cc8e..0577ae778d5 100644
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
@@ -3,7 +3,7 @@ module Projects
     def execute
       new_params = {
         forked_from_project_id: @project.id,
-        visibility_level:       allowed_visibility_level,
+        visibility_level:       @project.visibility_level,
         description:            @project.description,
         name:                   @project.name,
         path:                   @project.path,
@@ -19,17 +19,5 @@ module Projects
       new_project = CreateService.new(current_user, new_params).execute
       new_project
     end
-
-    private
-
-    def allowed_visibility_level
-      project_level = @project.visibility_level
-
-      if Gitlab::VisibilityLevel.non_restricted_level?(project_level)
-        project_level
-      else
-        Gitlab::VisibilityLevel.highest_allowed_level
-      end
-    end
   end
 end
diff --git a/app/services/projects/housekeeping_service.rb b/app/services/projects/housekeeping_service.rb
index 43db29315a1..3b7c36f0908 100644
--- a/app/services/projects/housekeeping_service.rb
+++ b/app/services/projects/housekeeping_service.rb
@@ -22,7 +22,7 @@ module Projects
     end
 
     def execute
-      raise LeaseTaken unless try_obtain_lease
+      raise LeaseTaken if !try_obtain_lease
 
       GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace)
     ensure
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index c4838d31f2f..ef15ef6a473 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -39,7 +39,7 @@ module Projects
       begin
         gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
       rescue Gitlab::Shell::Error => e
-        raise Error,  "Error importing repository #{project.import_url} into #{project.path_with_namespace} - #{e.message}"
+        raise Error, e.message
       end
     end
 
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 03b57dea51e..111b3ec05ea 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -34,11 +34,6 @@ module Projects
           raise TransferError.new("Project with same path in target namespace already exists")
         end
 
-        if project.has_container_registry_tags?
-          # we currently doesn't support renaming repository if it contains tags in container registry
-          raise TransferError.new('Project cannot be transferred, because tags are present in its container registry')
-        end
-
         project.expire_caches_before_rename(old_path)
 
         # Apply new namespace id and visibility level