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/git | |
| parent | d43aaf286fe6b8e8383e73ea580274d8841608d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 5 |
1 files changed, 2 insertions, 3 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 |