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/environments_helper.rb')
-rw-r--r--app/helpers/environments_helper.rb26
1 files changed, 2 insertions, 24 deletions
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 525fdd3e9f6..3360a5256af 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -26,7 +26,7 @@ module EnvironmentsHelper
metrics_data = {}
metrics_data.merge!(project_metrics_data(project)) if project
- metrics_data.merge!(environment_metrics_data(environment, project)) if environment
+ metrics_data.merge!(environment_metrics_data(environment)) if environment
metrics_data.merge!(project_and_environment_metrics_data(project, environment)) if project && environment
metrics_data.merge!(static_metrics_data)
@@ -46,14 +46,6 @@ module EnvironmentsHelper
can?(current_user, :destroy_environment, environment)
end
- def environment_data(environment)
- Gitlab::Json.generate({
- id: environment.id,
- name: environment.name,
- external_url: environment.external_url
- })
- end
-
private
def project_metrics_data(project)
@@ -74,34 +66,20 @@ module EnvironmentsHelper
}
end
- def environment_metrics_data(environment, project = nil)
+ def environment_metrics_data(environment)
return {} unless environment
{
- 'metrics_dashboard_base_path' => metrics_dashboard_base_path(environment, project),
'current_environment_name' => environment.name,
'has_metrics' => environment.has_metrics?.to_s,
'environment_state' => environment.state.to_s
}
end
- def metrics_dashboard_base_path(environment, project)
- # This is needed to support our transition from environment scoped metric paths to project scoped.
- if project
- path = project_metrics_dashboard_path(project)
-
- return path if request.path.include?(path)
- end
-
- project_metrics_dashboard_path(project, environment: environment)
- end
-
def project_and_environment_metrics_data(project, environment)
return {} unless project && environment
{
- 'metrics_endpoint' => additional_metrics_project_environment_path(project, environment, format: :json),
- 'dashboard_endpoint' => metrics_dashboard_project_environment_path(project, environment, format: :json),
'deployments_endpoint' => project_environment_deployments_path(project, environment, format: :json),
'operations_settings_path' => project_settings_operations_path(project),
'can_access_operations_settings' => can?(current_user, :admin_operations, project).to_s,