diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-07 13:50:40 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-07 13:50:40 +0300 |
| commit | 4a341c6d3ca38b99458b8ed5e723c3a189ba267b (patch) | |
| tree | 9a36395b4771a1c56e9ae5dc5263cbdb8fa4626d | |
| parent | 493fb889d1d826780ff66ba7eb26bff992115eb6 (diff) | |
| parent | 0917e817838fb5ecb3993a18baafa2eadff9cf40 (diff) | |
Merge branch 'consistent-deployment_platform' into 'master'
Unify deployment_platform interface with EE
See merge request gitlab-org/gitlab-ce!17594
| -rw-r--r-- | app/models/concerns/deployment_platform.rb | 3 | ||||
| -rw-r--r-- | app/models/environment.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index 89d0474a596..faa94204e33 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -1,5 +1,6 @@ module DeploymentPlatform - def deployment_platform + # EE would override this and utilize the extra argument + def deployment_platform(environment: nil) @deployment_platform ||= find_cluster_platform_kubernetes || find_kubernetes_service_integration || diff --git a/app/models/environment.rb b/app/models/environment.rb index 24d4f1d8761..582a7818502 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -225,7 +225,7 @@ class Environment < ActiveRecord::Base end def deployment_platform - project.deployment_platform + project.deployment_platform(environment: self) end private |