Merge branch 'consistent-deployment_platform' into 'master'

Unify deployment_platform interface with EE See merge request gitlab-org/gitlab-ce!17594

Merge branch 'consistent-deployment_platform' into 'master'
8d6f74ce · Grzegorz Bizon · James Lopez · 39ced571 · 8d6f74ce · 8d6f74ce
Unverified Commit 8d6f74ce authored Mar 07, 2018 by Grzegorz Bizon Committed by James Lopez Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

deployment_platform.rb app/models/concerns/deployment_platform.rb +2 -1

environment.rb app/models/environment.rb +1 -1

No files found.
--- a/app/models/concerns/deployment_platform.rb
+++ b/app/models/concerns/deployment_platform.rb
 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 ||

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