Commit 295e5821 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

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
parent a2d647b1
...@@ -543,14 +543,8 @@ module Gitlab ...@@ -543,14 +543,8 @@ module Gitlab
end end
def update_branch(branch_name, user:, newrev:, oldrev:) def update_branch(branch_name, user:, newrev:, oldrev:)
gitaly_migrate(:operation_user_update_branch) do |is_enabled| wrapped_gitaly_errors do
if is_enabled gitaly_operation_client.user_update_branch(branch_name, user, newrev, oldrev)
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
end end
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