diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-10 02:44:17 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-10 22:47:08 +0300 |
| commit | 562e77abbe46433f38808f893a06580a4ed76240 (patch) | |
| tree | b331bbcb696a83dd52da2a80e700743804e37bb7 | |
| parent | f5732c949835d75280fe1f485cfbbd6051b125c8 (diff) | |
Remove unused Ruby rebase/squash code
https://gitlab.com/gitlab-org/gitaly/merge_requests/698
rewrote Is{Squash,Rebase}InProgress in Go, so this Ruby code
is no longer needed.
| -rw-r--r-- | changelogs/unreleased/sh-remove-rebase-squash-ruby-code.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitaly_server/repository_service.rb | 16 |
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) |