diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
| commit | f6905d2ed293ccde386ba2798e7a623c228e8f51 (patch) | |
| tree | 83e7defc9e9ec94462c3bc3d86e4ca0cbc4b7c21 /app/helpers/environments_helper.rb | |
| parent | f2f748c08166ef350aa4183242c3611f6617f651 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/environments_helper.rb')
| -rw-r--r-- | app/helpers/environments_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb index 57f3c99b74d..41a255434af 100644 --- a/app/helpers/environments_helper.rb +++ b/app/helpers/environments_helper.rb @@ -60,7 +60,8 @@ module EnvironmentsHelper 'custom-metrics-path' => project_prometheus_metrics_path(project), 'validate-query-path' => validate_query_project_prometheus_metrics_path(project), 'custom-metrics-available' => "#{custom_metrics_available?(project)}", - 'prometheus-alerts-available' => "#{can?(current_user, :read_prometheus_alerts, project)}" + 'prometheus-alerts-available' => "#{can?(current_user, :read_prometheus_alerts, project)}", + 'dashboard-timezone' => project.metrics_setting_dashboard_timezone.to_s.upcase } end |