summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:09 +0000
commit0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch)
tree64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /app/helpers
parent6044caed20964a70c1ac6c5a3365d567ed96dfde (diff)
downloadgitlab-ce-0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/environments_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 68d78959407..fcf99644e66 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -38,7 +38,8 @@ module EnvironmentsHelper
"tags-path" => project_tags_path(project),
"has-metrics" => "#{environment.has_metrics?}",
"prometheus-status" => "#{environment.prometheus_status}",
- "external-dashboard-url" => project.metrics_setting_external_dashboard_url
+ "external-dashboard-url" => project.metrics_setting_external_dashboard_url,
+ "environment-state" => "#{environment.state}"
}
end