diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 09:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 09:09:39 +0000 |
| commit | c52b81f45762cb7f05a950689dfc6d51b197ea73 (patch) | |
| tree | c44830c2fc21d13b81814958c44b09fa8d11c805 /app/presenters | |
| parent | 187ee320b39af22929d74c5a2d9b0650bf50a09b (diff) | |
| download | gitlab-ce-c52b81f45762cb7f05a950689dfc6d51b197ea73.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/projects/prometheus/alert_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/projects/prometheus/alert_presenter.rb b/app/presenters/projects/prometheus/alert_presenter.rb index 02e22f8f46a..c03925c0871 100644 --- a/app/presenters/projects/prometheus/alert_presenter.rb +++ b/app/presenters/projects/prometheus/alert_presenter.rb @@ -3,7 +3,7 @@ module Projects module Prometheus class AlertPresenter < Gitlab::View::Presenter::Delegated - RESERVED_ANNOTATIONS = %w(gitlab_incident_markdown title).freeze + RESERVED_ANNOTATIONS = %w(gitlab_incident_markdown gitlab_y_label title).freeze GENERIC_ALERT_SUMMARY_ANNOTATIONS = %w(monitoring_tool service hosts).freeze MARKDOWN_LINE_BREAK = " \n".freeze INCIDENT_LABEL_NAME = IncidentManagement::CreateIssueService::INCIDENT_LABEL[:title].freeze |