summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-10 13:32:20 +0000
committerRémy Coutable <remy@rymai.me>2018-07-10 13:32:20 +0000
commit7358211ece27ccc9b6653b73efd9cada8bbb254a (patch)
tree63248ff717b12424ac8dad142a89f856167378a0
parentb7531f71a6bc14c96058e36bb6d4a4ad896da583 (diff)
parent1f28f4567b99518e4ae5df8d85f3f122b6737c1d (diff)
downloadgitlab-ce-7358211ece27ccc9b6653b73efd9cada8bbb254a.tar.gz
Merge branch '49057-fix-repository-typo' into 'master'
Fix a typo in Gitlab::Git::Repository See merge request gitlab-org/gitlab-ce!20520
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 897adbd5ec9..a1a050647b9 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -627,7 +627,7 @@ module Gitlab
def update_branch(branch_name, user:, newrev:, oldrev:)
gitaly_migrate(:operation_user_update_branch) do |is_enabled|
if is_enabled
- gitaly_operations_client.user_update_branch(branch_name, user, newrev, oldrev)
+ gitaly_operation_client.user_update_branch(branch_name, user, newrev, oldrev)
else
OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
end