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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2786d418
Commit
2786d418
authored
Sep 06, 2019
by
Ryan Cobb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add clarifying comment
parent
32b711f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/controllers/ee/clusters/clusters_controller.rb
ee/app/controllers/ee/clusters/clusters_controller.rb
+1
-1
ee/spec/services/metrics/dashboard/cluster_dashboard_service_spec.rb
...vices/metrics/dashboard/cluster_dashboard_service_spec.rb
+1
-1
No files found.
ee/app/controllers/ee/clusters/clusters_controller.rb
View file @
2786d418
...
...
@@ -51,7 +51,7 @@ module EE
end
def
metrics_dashboard
project_for_dashboard
=
defined?
(
project
)
?
project
:
nil
project_for_dashboard
=
defined?
(
project
)
?
project
:
nil
# Project is not defined for group and admin level clusters
dashboard
=
::
Gitlab
::
Metrics
::
Dashboard
::
Finder
.
find
(
project_for_dashboard
,
current_user
,
metrics_dashboard_params
)
respond_to
do
|
format
|
...
...
ee/spec/services/metrics/dashboard/cluster_dashboard_service_spec.rb
View file @
2786d418
...
...
@@ -31,7 +31,7 @@ describe Metrics::Dashboard::ClusterDashboardService, :use_clean_rails_memory_st
context
'when called with a non-system dashboard'
do
let
(
:dashboard_path
)
{
'garbage/dashboard/path'
}
# We want to alwa
u
s return the cluster dashboard.
# We want to alwa
y
s return the cluster dashboard.
it_behaves_like
'valid dashboard service response'
end
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