diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-07 10:50:40 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-07 11:57:02 +0100 |
| commit | 8d6f74ceefd682f756ee8f1300efae4d0f51c3c0 (patch) | |
| tree | c5a919175c2b2945ce428a7457bae1ed423fcb9c | |
| parent | 39ced5712778ca02148480a5f4ee35345b5f6ec0 (diff) | |
| download | gitlab-ce-8d6f74ceefd682f756ee8f1300efae4d0f51c3c0.tar.gz | |
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 |