Merge branch '323659-remove-unneeded-allow-disk-access-call' into 'master'

Remove a Gitaly allow_disk_access call

See merge request !59879

ee/app/services/projects/update_mirror_service.rb

@@ -142,10 +142,10 @@ def handle_diverged_branch(upstream, local, branch_name, errors)
         newrev = upstream.dereferenced_target.sha
         oldrev = local.dereferenced_target.sha
 
-        # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1246
-        ::Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          repository.update_branch(branch_name, user: current_user, newrev: newrev, oldrev: oldrev)
-        end
+        # If the user doesn't have permission to update the diverged branch
+        # (e.g. it's protected and the user can't force-push to protected
+        # branches), this will fail.
+        repository.update_branch(branch_name, user: current_user, newrev: newrev, oldrev: oldrev)
       elsif branch_name == project.default_branch
         # Cannot be updated
         errors << "The default branch (#{project.default_branch}) has diverged from its upstream counterpart and could not be updated automatically."