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>2021-08-24 18:10:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-24 18:10:36 +0300
commit234dc40a12a1cdaef0cdb825ca4acc3f271c6394 (patch)
treefb9875dca8b558acafa54c36a591b4d2ed10fc49 /app/services/terraform
parentc7864d3d50b4002c621c7cba2e1ebfb5d23ac7ed (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/terraform')
-rw-r--r--app/services/terraform/remote_state_handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/terraform/remote_state_handler.rb b/app/services/terraform/remote_state_handler.rb
index e9a13cee764..7543a79eddf 100644
--- a/app/services/terraform/remote_state_handler.rb
+++ b/app/services/terraform/remote_state_handler.rb
@@ -70,7 +70,7 @@ module Terraform
return find_state!(find_params) if find_only
- state = Terraform::State.create_or_find_by(find_params)
+ state = Terraform::State.create_or_find_by(find_params) # rubocop:disable Performance/ActiveRecordSubtransactionMethods
# https://github.com/rails/rails/issues/36027
return state unless state.errors.of_kind? :name, :taken