Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-13 03:16:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-13 03:16:12 +0300
commit4dc620034e192cdfb4dab5908a2f406e37e76b68 (patch)
tree9cd1069bce3d425254639309cb4fc4bda396c9ac /app/models/clusters
parentd36c792351474304405b5a1033dc2c4815ebc0e4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/runner.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb
index 5db065bad7f..0ca3bcbf852 100644
--- a/app/models/clusters/applications/runner.rb
+++ b/app/models/clusters/applications/runner.rb
@@ -41,7 +41,9 @@ module Clusters
end
def prepare_uninstall
- runner&.update!(active: false)
+ ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350180') do
+ runner&.update!(active: false)
+ end
end
def post_uninstall