Commit 5cd90761 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '201846-embed-add-link-to-embed--page-key-fix' into 'master'

Switch `logs-page` key to snake_case

Closes #201846

See merge request gitlab-org/gitlab!25288
parents e06090d7 1319c17c
......@@ -46,7 +46,7 @@ module EE
"custom-metrics-available" => "#{custom_metrics_available?(project)}",
"alerts-endpoint" => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
"prometheus-alerts-available" => "#{can?(current_user, :read_prometheus_alerts, project)}",
"logs-path" => project_logs_path(project, environment_name: environment.name)
"logs_path" => project_logs_path(project, environment_name: environment.name)
}
super.merge(ee_metrics_data)
......
---
title: Fix to display a link to the logs in both embed and dashboard
merge_request: 25288
author:
type: fixed
......@@ -27,7 +27,7 @@ describe EnvironmentsHelper do
'custom-metrics-available' => 'false',
'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
'prometheus-alerts-available' => 'true',
'logs-path' => project_logs_path(project, environment_name: environment.name)
'logs_path' => project_logs_path(project, environment_name: environment.name)
)
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment