diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 12:09:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 12:09:03 +0000 |
commit | 53ea1228bef63279e558b08b50144775f6f3a4c4 (patch) | |
tree | ec6534ce84a6451a67f1c34257064e1aa624b717 /app/services/terraform | |
parent | 764ff99273496e7d1da0dc9cc2255445cf7dc540 (diff) | |
download | gitlab-ce-53ea1228bef63279e558b08b50144775f6f3a4c4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/terraform')
-rw-r--r-- | app/services/terraform/remote_state_handler.rb | 2 |
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 7543a79eddf..e9a13cee764 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) # rubocop:disable Performance/ActiveRecordSubtransactionMethods + state = Terraform::State.create_or_find_by(find_params) # https://github.com/rails/rails/issues/36027 return state unless state.errors.of_kind? :name, :taken |