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
This commit is contained in:
Stan Hu 2018-01-05 08:20:43 +00:00
commit 1560c234d2
1 changed files with 4 additions and 3 deletions

View File

@ -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