Commit 5bf9f5b6 authored by Douwe Maan's avatar Douwe Maan

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
parents ccdd16dc 295e5821
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment