diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index fd31039491a..6e2e664fc52 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -842,10 +842,9 @@ module Gitlab end end - def squash(user, squash_id, branch:, start_sha:, end_sha:, author:, message:) + def squash(user, squash_id, start_sha:, end_sha:, author:, message:) wrapped_gitaly_errors do - gitaly_operation_client.user_squash(user, squash_id, branch, - start_sha, end_sha, author, message) + gitaly_operation_client.user_squash(user, squash_id, start_sha, end_sha, author, message) end end diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index 67fb0ab9608..9ed4b2da09a 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -248,12 +248,11 @@ module Gitlab request_enum.close end - def user_squash(user, squash_id, branch, start_sha, end_sha, author, message) + def user_squash(user, squash_id, start_sha, end_sha, author, message) request = Gitaly::UserSquashRequest.new( repository: @gitaly_repo, user: Gitlab::Git::User.from_gitlab(user).to_gitaly, squash_id: squash_id.to_s, - branch: encode_binary(branch), start_sha: start_sha, end_sha: end_sha, author: Gitlab::Git::User.from_gitlab(author).to_gitaly, |