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
9cdec947
Commit
9cdec947
authored
Jan 31, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests where project is nil
parent
bb79e3cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/project_services/prometheus_service.rb
app/models/project_services/prometheus_service.rb
+2
-1
No files found.
app/models/project_services/prometheus_service.rb
View file @
9cdec947
...
...
@@ -45,6 +45,7 @@ class PrometheusService < MonitoringService
def
fields
return
[]
unless
editable?
[
{
type:
'checkbox'
,
...
...
@@ -124,7 +125,7 @@ class PrometheusService < MonitoringService
end
def
prometheus_installed?
return
false
if
template?
return
false
if
template?
||
!
project
project
.
clusters
.
enabled
.
any?
{
|
cluster
|
cluster
.
application_prometheus
&
.
installed?
}
end
...
...
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