root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Try to reduce complexity again

This commit is contained in:
syasonik 2019-04-17 23:59:31 +08:00
parent ed87159a71
commit 1edbf97e25
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/projects/environments_controller.rb
View File

@ -158,22 +158,16 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end end
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)
respond_to do |format| respond_to do |format|
format.json do format.json do
result = Gitlab::MetricsDashboard::Service.new(@project, @current_user, environment: environment).get_dashboard result = Gitlab::MetricsDashboard::Service.new(@project, @current_user, environment: environment).get_dashboard
if result[:status] == :success ok_status = :ok if result[:status] == :success
status_code = :ok status = ok_status || result[:http_status] || :bad_request
details = { dashboard: result[:dashboard] }
else
status_code = result[:http_status] || :bad_request
details = { message: result[:message] }
end
render status: status_code, render status: status, json: result
json: { status: result[:status] }.merge(details)
end end
end end
end end