diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 06:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 06:09:27 +0300 |
| commit | 9345f69894862e02f3491ea3136c3ed2b23fd5b8 (patch) | |
| tree | 08a4a1b2861cd5894e2a1146300a206071f06ea3 /lib/gitlab/gitaly_client | |
| parent | d43aaf286fe6b8e8383e73ea580274d8841608d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gitaly_client')
| -rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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, |