diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-25 19:00:19 -0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-31 16:28:09 -0300 |
commit | 37cc50f843c5dbd4c7fb3126f9730024c89849d4 (patch) | |
tree | 3af232373137fd02ee3e520f3aad574810157bc0 /lib/gitlab/gitaly_client/operation_service.rb | |
parent | 74a0e855e1d5049e265c85ac01d511c25f2a46f1 (diff) | |
download | gitlab-ce-37cc50f843c5dbd4c7fb3126f9730024c89849d4.tar.gz |
Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge
Diffstat (limited to 'lib/gitlab/gitaly_client/operation_service.rb')
-rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index adaf255f24b..526d44a8b77 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -105,6 +105,23 @@ module Gitlab ensure request_enum.close end + + def user_ff_branch(user, source_sha, target_branch) + request = Gitaly::UserFFBranchRequest.new( + repository: @gitaly_repo, + user: Gitlab::Git::User.from_gitlab(user).to_gitaly, + commit_id: source_sha, + branch: GitalyClient.encode(target_branch) + ) + + branch_update = GitalyClient.call( + @repository.storage, + :operation_service, + :user_ff_branch, + request + ).branch_update + Gitlab::Git::OperationService::BranchUpdate.from_gitaly(branch_update) + end end end end |