Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
0917e817
Commit
0917e817
authored
Mar 07, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify deployment_platform interface with EE
parent
cfe203fa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/models/concerns/deployment_platform.rb
app/models/concerns/deployment_platform.rb
+2
-1
app/models/environment.rb
app/models/environment.rb
+1
-1
No files found.
app/models/concerns/deployment_platform.rb
View file @
0917e817
module
DeploymentPlatform
module
DeploymentPlatform
def
deployment_platform
# EE would override this and utilize the extra argument
def
deployment_platform
(
environment:
nil
)
@deployment_platform
||=
@deployment_platform
||=
find_cluster_platform_kubernetes
||
find_cluster_platform_kubernetes
||
find_kubernetes_service_integration
||
find_kubernetes_service_integration
||
...
...
app/models/environment.rb
View file @
0917e817
...
@@ -225,7 +225,7 @@ class Environment < ActiveRecord::Base
...
@@ -225,7 +225,7 @@ class Environment < ActiveRecord::Base
end
end
def
deployment_platform
def
deployment_platform
project
.
deployment_platform
project
.
deployment_platform
(
environment:
self
)
end
end
private
private
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment