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
131494f2
Commit
131494f2
authored
Apr 19, 2019
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor metrics_dashboard response conditionals
parent
c1c0fb66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+5
-11
No files found.
app/controllers/projects/environments_controller.rb
View file @
131494f2
...
@@ -159,12 +159,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -159,12 +159,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController
def
metrics_dashboard
def
metrics_dashboard
render_403
&&
return
unless
Feature
.
enabled?
(
:environment_metrics_use_prometheus_endpoint
,
@project
)
render_403
&&
return
unless
Feature
.
enabled?
(
:environment_metrics_use_prometheus_endpoint
,
@project
)
result
=
Gitlab
::
MetricsDashboard
::
Service
.
new
(
@project
,
@current_user
,
environment:
environment
).
get_dashboard
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
json
do
if
result
[
:status
]
==
:success
result
=
Gitlab
::
MetricsDashboard
::
Service
.
new
(
@project
,
@current_user
,
environment:
environment
).
get_dashboard
format
.
json
{
render
status: :ok
,
json:
result
}
else
render_metrics_dashboard_response
(
result
)
format
.
json
{
render
status:
result
[
:http_status
],
json:
result
}
end
end
end
end
end
end
...
@@ -209,13 +210,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -209,13 +210,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
params
.
require
([
:start
,
:end
])
params
.
require
([
:start
,
:end
])
end
end
def
render_metrics_dashboard_response
(
result
)
ok_status
=
:ok
if
result
[
:status
]
==
:success
status
=
ok_status
||
result
[
:http_status
]
||
:bad_request
render
status:
status
,
json:
result
end
def
search_environment_names
def
search_environment_names
return
[]
unless
params
[
:query
]
return
[]
unless
params
[
:query
]
...
...
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