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 /spec/lib/gitlab/gitaly_client | |
parent | d43aaf286fe6b8e8383e73ea580274d8841608d7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/gitaly_client')
-rw-r--r-- | spec/lib/gitlab/gitaly_client/operation_service_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb index 563e0590482..45701b501bb 100644 --- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb @@ -274,7 +274,6 @@ describe Gitlab::GitalyClient::OperationService do end describe '#user_squash' do - let(:branch_name) { 'my-branch' } let(:squash_id) { '1' } let(:start_sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' } let(:end_sha) { '54cec5282aa9f21856362fe321c800c236a61615' } @@ -284,7 +283,6 @@ describe Gitlab::GitalyClient::OperationService do repository: repository.gitaly_repository, user: gitaly_user, squash_id: squash_id.to_s, - branch: branch_name, start_sha: start_sha, end_sha: end_sha, author: gitaly_user, @@ -295,7 +293,7 @@ describe Gitlab::GitalyClient::OperationService do let(:response) { Gitaly::UserSquashResponse.new(squash_sha: squash_sha) } subject do - client.user_squash(user, squash_id, branch_name, start_sha, end_sha, user, commit_message) + client.user_squash(user, squash_id, start_sha, end_sha, user, commit_message) end it 'sends a user_squash message and returns the squash sha' do |