Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/environment_helper.rb')
-rw-r--r--app/helpers/environment_helper.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/environment_helper.rb b/app/helpers/environment_helper.rb
index 2b3700a9f21..00109212934 100644
--- a/app/helpers/environment_helper.rb
+++ b/app/helpers/environment_helper.rb
@@ -79,7 +79,7 @@ module EnvironmentHelper
can_destroy_environment: can_destroy_environment?(environment),
can_stop_environment: can?(current_user, :stop_environment, environment),
can_admin_environment: can?(current_user, :admin_environment, project),
- environment_metrics_path: project_metrics_dashboard_path(project, environment: environment),
+ **environment_metrics_path(project, environment),
environments_fetch_path: project_environments_path(project, format: :json),
environment_edit_path: edit_project_environment_path(project, environment),
environment_stop_path: stop_project_environment_path(project, environment),
@@ -88,11 +88,18 @@ module EnvironmentHelper
environment_terminal_path: terminal_project_environment_path(project, environment),
has_terminals: environment.has_terminals?,
is_environment_available: environment.available?,
- auto_stop_at: environment.auto_stop_at
+ auto_stop_at: environment.auto_stop_at,
+ graphql_etag_key: environment.etag_cache_key
}
end
def environments_detail_data_json(user, project, environment)
environments_detail_data(user, project, environment).to_json
end
+
+ def environment_metrics_path(project, environment)
+ return {} if Feature.enabled?(:remove_monitor_metrics)
+
+ { environment_metrics_path: project_metrics_dashboard_path(project, environment: environment) }
+ end
end