summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-08-17 09:00:43 +0000
committerDouwe Maan <douwe@gitlab.com>2018-08-17 09:00:43 +0000
commit5bf9f5b67bf50f2fd3dd8f7fb67239c958b25c9a (patch)
tree16fb4d329f57dfe7d63e1761cc14ffe52b6a8d56
parentccdd16dcd3942f99097e094200bf5a9437cd76da (diff)
parent295e5821424fe1681eeaccd5fef5e21a4d23d006 (diff)
downloadgitlab-ce-5bf9f5b67bf50f2fd3dd8f7fb67239c958b25c9a.tar.gz
Merge branch 'zj-user-update-branch' into 'master'
Remove feature flags for UserUpdateBranch Closes gitaly#1246 and gitaly#1310 See merge request gitlab-org/gitlab-ce!21238
-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