Merge branch 'sh-remove-rebase-squash-ruby-code' into 'master'

Remove unused Ruby rebase/squash code

See merge request gitlab-org/gitaly!1033

2 files changed, 5 insertions, 16 deletions

diff --git a/changelogs/unreleased/sh-remove-rebase-squash-ruby-code.yml b/changelogs/unreleased/sh-remove-rebase-squash-ruby-code.yml
new file mode 100644
index 000000000..44327b852
--- /dev/null
+++ b/changelogs/unreleased/sh-remove-rebase-squash-ruby-code.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unused Ruby rebase/squash code
+merge_request: 1033
+author:
+type: other
diff --git a/ruby/lib/gitaly_server/repository_service.rb b/ruby/lib/gitaly_server/repository_service.rb
index b4abd31bf..223176eb1 100644
--- a/ruby/lib/gitaly_server/repository_service.rb
+++ b/ruby/lib/gitaly_server/repository_service.rb
@@ -38,22 +38,6 @@ module GitalyServer
       Gitaly::FetchRemoteResponse.new
     end
 
-    def is_rebase_in_progress(request, call) # rubocop:disable Naming/PredicateName
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-
-      result = repo.rebase_in_progress?(request.rebase_id)
-
-      Gitaly::IsRebaseInProgressResponse.new(in_progress: result)
-    end
-
-    def is_squash_in_progress(request, call) # rubocop:disable Naming/PredicateName
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-
-      result = repo.squash_in_progress?(request.squash_id)
-
-      Gitaly::IsSquashInProgressResponse.new(in_progress: result)
-    end
-
     def write_ref(request, call)
       Gitlab::Git::Repository.from_gitaly(request.repository, call)
                              .write_ref(request.ref, request.revision, old_ref: request.old_revision)