Commit 7d3cae74 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'rz-fix-prometheus-page-warning' into 'master'

Fix variable in _prometheus.html.haml so it shows as a code block

See merge request gitlab-org/gitlab!82395
parents 74633ff9 3c8716d9
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- unless Gitlab::Metrics.metrics_folder_present? - unless Gitlab::Metrics.metrics_folder_present?
.form-text.text-muted .form-text.text-muted
%strong.cred= _("WARNING:") %strong.cred= _("WARNING:")
= _("Environment variable %{code_start}%{environment_variable}%{code_end} does not exist or is not pointing to a valid directory.").html_safe % { environment_variable: prometheus_multiproc_dir, code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } = _("Environment variable %{environment_variable} does not exist or is not pointing to a valid directory.").html_safe % { environment_variable: '<code>prometheus_multiproc_dir</code>'.html_safe }
= link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory') = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
.form-group .form-group
= f.label :metrics_method_call_threshold, _('Method call threshold (ms)'), class: 'label-bold' = f.label :metrics_method_call_threshold, _('Method call threshold (ms)'), class: 'label-bold'
......
...@@ -13840,7 +13840,7 @@ msgstr "" ...@@ -13840,7 +13840,7 @@ msgstr ""
msgid "Environment scope" msgid "Environment scope"
msgstr "" msgstr ""
msgid "Environment variable %{code_start}%{environment_variable}%{code_end} does not exist or is not pointing to a valid directory." msgid "Environment variable %{environment_variable} does not exist or is not pointing to a valid directory."
msgstr "" msgstr ""
msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default." msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default."
......
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