diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-01-05 08:20:43 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-05 08:20:43 +0000 |
| commit | 1560c234d2410ccbd163b9aedecf2d8b7a596627 (patch) | |
| tree | 9cce60907ded5a9d2304ee2fa7680798ef6fbb09 | |
| parent | f7afb14c1150d686e53cb71da182ef014eba2a61 (diff) | |
| parent | 8b3b28b8d81acc719701a3c2bfc05b6f7c22c4f2 (diff) | |
| download | gitlab-ce-1560c234d2410ccbd163b9aedecf2d8b7a596627.tar.gz | |
Merge branch '41695-use-simple-assignment' into 'master'
Resolve "Master failure due to static-analysis job in app/models/concerns/deployment_platform.rb"
Closes #41695
See merge request gitlab-org/gitlab-ce!16246
| -rw-r--r-- | app/models/concerns/deployment_platform.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index e1373455e98..89d0474a596 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -1,8 +1,9 @@ module DeploymentPlatform def deployment_platform - @deployment_platform ||= find_cluster_platform_kubernetes - @deployment_platform ||= find_kubernetes_service_integration - @deployment_platform ||= build_cluster_and_deployment_platform + @deployment_platform ||= + find_cluster_platform_kubernetes || + find_kubernetes_service_integration || + build_cluster_and_deployment_platform end private |