diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/serializers/environment_entity.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/serializers/environment_entity.rb')
-rw-r--r-- | app/serializers/environment_entity.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb index a2bf9716f8f..7da5910a75b 100644 --- a/app/serializers/environment_entity.rb +++ b/app/serializers/environment_entity.rb @@ -71,8 +71,6 @@ class EnvironmentEntity < Grape::Entity can?(current_user, :destroy_environment, environment) end - expose :has_opened_alert?, if: -> (*) { can_read_alert_management_alert? }, expose_nil: false, as: :has_opened_alert - private alias_method :environment, :object @@ -93,10 +91,6 @@ class EnvironmentEntity < Grape::Entity can?(current_user, :read_pod_logs, environment.project) end - def can_read_alert_management_alert? - can?(current_user, :read_alert_management_alert, environment.project) - end - def cluster_platform_kubernetes? deployment_platform && deployment_platform.is_a?(Clusters::Platforms::Kubernetes) end |