diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-03-07 18:14:25 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-03-07 18:14:25 +0800 |
| commit | 0917e817838fb5ecb3993a18baafa2eadff9cf40 (patch) | |
| tree | e04e66e5ea54486694914332f63b2d8f0281c411 | |
| parent | cfe203fa3a77adbb33f877c98af5e117b1ccd281 (diff) | |
| download | gitlab-ce-0917e817838fb5ecb3993a18baafa2eadff9cf40.tar.gz | |
Unify deployment_platform interface with EE
| -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 |