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
Boxiang Sun
gitlab-ce
Commits
637c9558
Commit
637c9558
authored
6 years ago
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing test, when deployment platform is not bound to a cluster.
parent
0feeddaa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
app/models/environment.rb
app/models/environment.rb
+4
-2
No files found.
app/models/environment.rb
View file @
637c9558
...
...
@@ -233,8 +233,10 @@ class Environment < ActiveRecord::Base
end
def
cluster_prometheus_adapter
cluster
=
project
.
deployment_platform
&
.
cluster
return
unless
cluster
&
.
application_prometheus
&
.
installed?
return
unless
project
.
deployment_platform
.
respond_to?
(
:cluster
)
cluster
=
project
.
deployment_platform
.
cluster
return
unless
cluster
.
application_prometheus
&
.
installed?
cluster
.
application_prometheus
end
...
...
This diff is collapsed.
Click to expand it.
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