Remove unnecessary satellite files and add CHANGELOG item

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 0 insertions, 67 deletions

diff --git a/lib/gitlab/satellite/files/delete_file_action.rb b/lib/gitlab/satellite/files/delete_file_action.rb
deleted file mode 100644
index 0d37b9dea85..00000000000
--- a/lib/gitlab/satellite/files/delete_file_action.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require_relative 'file_action'
-
-module Gitlab
-  module Satellite
-    class DeleteFileAction < FileAction
-      # Deletes file and creates a new commit for it
-      #
-      # Returns false if committing the change fails
-      # Returns false if pushing from the satellite to bare repo failed or was rejected
-      # Returns true otherwise
-      def commit!(content, commit_message)
-        in_locked_and_timed_satellite do |repo|
-          prepare_satellite!(repo)
-
-          # create target branch in satellite at the corresponding commit from bare repo
-          repo.git.checkout({ raise: true, timeout: true, b: true }, ref, "origin/#{ref}")
-
-          # update the file in the satellite's working dir
-          file_path_in_satellite = File.join(repo.working_dir, file_path)
-
-          # Prevent relative links
-          unless safe_path?(file_path_in_satellite)
-            Gitlab::GitLogger.error("FileAction: Relative path not allowed")
-            return false
-          end
-
-          File.delete(file_path_in_satellite)
-
-          # add removed file
-          repo.remove(file_path_in_satellite)
-
-          # commit the changes
-          # will raise CommandFailed when commit fails
-          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
-
-
-          # push commit back to bare repo
-          # will raise CommandFailed when push fails
-          repo.git.push({ raise: true, timeout: true }, :origin, ref)
-
-          # everything worked
-          true
-        end
-      rescue Grit::Git::CommandFailed => ex
-        Gitlab::GitLogger.error(ex.message)
-        false
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/files/file_action.rb b/lib/gitlab/satellite/files/file_action.rb
deleted file mode 100644
index 0b441a59e38..00000000000
--- a/lib/gitlab/satellite/files/file_action.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Gitlab
-  module Satellite
-    class FileAction < Action
-      attr_accessor :file_path, :ref
-
-      def initialize(user, project, ref, file_path)
-        super user, project
-        @file_path = file_path
-        @ref = ref
-      end
-
-      def safe_path?(path)
-        File.absolute_path(path) == path
-      end
-    end
-  end
-end