summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-11-13 14:06:09 +0900
committerShinya Maeda <shinya@gitlab.com>2018-11-13 14:06:09 +0900
commitd8c24ac14757208c9df487ace6887a2f9a6d1ff9 (patch)
tree59f7fd2ab446dc2d114534850dd0680de470f9de
parent09e693c61f52e598db243f491cd8405da7f3f293 (diff)
downloadgitlab-ce-fix-deployment-metrics-in-mr-widget.tar.gz
Remove unrelated changesfix-deployment-metrics-in-mr-widget
-rw-r--r--app/serializers/environment_status_entity.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/environment_status_entity.rb b/app/serializers/environment_status_entity.rb
index a6fe9a75c82..f6321b9e520 100644
--- a/app/serializers/environment_status_entity.rb
+++ b/app/serializers/environment_status_entity.rb
@@ -11,7 +11,7 @@ class EnvironmentStatusEntity < Grape::Entity
project_environment_path(es.project, es.environment)
end
- expose :metrics_url, if: ->(*) { can_read_environment? && can_read_deployment? && deployment.has_metrics? } do |es|
+ expose :metrics_url, if: ->(*) { can_read_environment? && deployment.has_metrics? } do |es|
metrics_project_environment_deployment_path(es.project, es.environment, es.deployment)
end
@@ -61,10 +61,6 @@ class EnvironmentStatusEntity < Grape::Entity
can?(current_user, :read_environment, environment)
end
- def can_read_deployment?
- can?(current_user, :read_deployment, deployment)
- end
-
def can_stop_environment?
can?(current_user, :stop_environment, environment)
end