summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-08-16 10:24:26 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-08-16 10:24:26 +0200
commit295e5821424fe1681eeaccd5fef5e21a4d23d006 (patch)
tree6e973262b70108597a762a739d4c981ae01e0efc
parenta2d647b1137821ef87fc177ac85ac775f2ce55c1 (diff)
downloadgitlab-ce-295e5821424fe1681eeaccd5fef5e21a4d23d006.tar.gz
Remove feature flags for UserUpdateBranch
This has been tested on .com. So far no errors have been seen. Closes https://gitlab.com/gitlab-org/gitaly/issues/1310 Closes https://gitlab.com/gitlab-org/gitaly/issues/1246
-rw-r--r--lib/gitlab/git/repository.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index e9c901f8592..9521a2d63a0 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -543,14 +543,8 @@ module Gitlab
end
def update_branch(branch_name, user:, newrev:, oldrev:)
- gitaly_migrate(:operation_user_update_branch) do |is_enabled|
- if is_enabled
- gitaly_operation_client.user_update_branch(branch_name, user, newrev, oldrev)
- else
- Gitlab::GitalyClient::StorageSettings.allow_disk_access do
- OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
- end
- end
+ wrapped_gitaly_errors do
+ gitaly_operation_client.user_update_branch(branch_name, user, newrev, oldrev)
end
end